Merge branch 'translate-sizes' into upstream

13 files changed, 92 insertions, 74 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cc07f68..8182553 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak HQ</string>
   <string name="gps">GPS Cache Exhibit</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">small</string>
+  <string name="cache_size_regular">regular</string>
+  <string name="cache_size_large">large</string>
+  <string name="cache_size_other">other</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">not chosen</string>
+
   <!-- waypoints -->
   <string name="wp_final">Final</string>
   <string name="wp_stage">Station eines Multi-Cache</string>
@@ -320,13 +329,6 @@
   <string name="caches_filter_track">mit Trackables</string>
   <string name="caches_filter_clear">Filter zurücksetzen</string>
   <string name="caches_filter_size_title">Größe wählen</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">small</string>
-  <string name="caches_filter_size_regular">regular</string>
-  <string name="caches_filter_size_large">large</string>
-  <string name="caches_filter_size_other">other</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">not chosen</string>
   <string name="caches_filter_type_title">Wähle den Typ</string>
   <string name="caches_filter_type_traditional">Traditional cache</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2ecb88f..5b4c72a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak HQ</string>
   <string name="gps">Exhibición de escondites GPS </string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">pequeño</string>
+  <string name="cache_size_regular">normal</string>
+  <string name="cache_size_large">grande</string>
+  <string name="cache_size_other">otro</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">no elegido</string>
+
   <!-- waypoints -->
   <string name="wp_final">Ubicación final</string>
   <string name="wp_stage">Etapa de multi escondite</string>
@@ -317,13 +326,6 @@
   <string name="caches_filter_track">con rastreables</string>
   <string name="caches_filter_clear">limpiar filtros</string>
   <string name="caches_filter_size_title">Indica tamaño</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">pequeño</string>
-  <string name="caches_filter_size_regular">normal</string>
-  <string name="caches_filter_size_large">grande</string>
-  <string name="caches_filter_size_other">otro</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">no elegido</string>
   <string name="caches_filter_type_title">Indica tipo</string>
   <string name="caches_filter_type_traditional">Tradicional cache</string>
   <string name="caches_filter_type_multi">Multi</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8dc30e4..4c79ea5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">groundspeak hq</string>
   <string name="gps">gps cache exhibit</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">petite</string>
+  <string name="cache_size_regular">normale</string>
+  <string name="cache_size_large">grande</string>
+  <string name="cache_size_other">autre</string>
+  <string name="cache_size_virtual">virtuelle</string>
+  <string name="cache_size_notchosen">non renseignée</string>
+
   <!-- waypoints -->
   <string name="wp_final">Étape finale</string>
   <string name="wp_stage">Étape</string>
@@ -228,13 +237,6 @@
   <string name="caches_filter_track">avec des trackables</string>
   <string name="caches_filter_clear">effacer les filtres</string>
   <string name="caches_filter_size_title">Choisir la taille</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">petite</string>
-  <string name="caches_filter_size_regular">normale</string>
-  <string name="caches_filter_size_large">grande</string>
-  <string name="caches_filter_size_other">autre</string>
-  <string name="caches_filter_size_virtual">virtuelle</string>
-  <string name="caches_filter_size_notchosen">non renseignée</string>
   <string name="caches_filter_type_title">Choisir le type</string>
   <string name="caches_filter_type_traditional">Traditionelle</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5894a42..fb61c47 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak hq</string>
   <string name="gps">Gps cache exhibit</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">small</string>
+  <string name="cache_size_regular">regular</string>
+  <string name="cache_size_large">large</string>
+  <string name="cache_size_other">other</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">not chosen</string>
+
   <!-- waypoints -->
   <string name="wp_final">Eindbestemming</string>
   <string name="wp_stage">Multi-cache punt</string>
@@ -314,13 +323,6 @@
   <string name="caches_filter_track">met trackables</string>
   <string name="caches_filter_clear">maak filters leeg</string>
   <string name="caches_filter_size_title">Kies grootte</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">small</string>
-  <string name="caches_filter_size_regular">regular</string>
-  <string name="caches_filter_size_large">large</string>
-  <string name="caches_filter_size_other">other</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">not chosen</string>
   <string name="caches_filter_type_title">Choose type</string>
   <string name="caches_filter_type_traditional">Traditional cache</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2d71fd6..4563eea 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak HQ</string>
   <string name="gps">GPS cache exhibit</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">mikro</string>
+  <string name="cache_size_small">mała</string>
+  <string name="cache_size_regular">normalna</string>
+  <string name="cache_size_large">duża</string>
+  <string name="cache_size_other">inna</string>
+  <string name="cache_size_virtual">wirtualna</string>
+  <string name="cache_size_notchosen">nie wybrana</string>
+
   <!-- waypoints -->
   <string name="wp_final">Finał</string>
   <string name="wp_stage">Etap do skrzynki</string>
@@ -314,13 +323,6 @@
   <string name="caches_filter_track">z przedmiotmi podróżnymi</string>
   <string name="caches_filter_clear">wykasój filter</string>
   <string name="caches_filter_size_title">Wybierz wielkość</string>
-  <string name="caches_filter_size_micro">mikro</string>
-  <string name="caches_filter_size_small">mała</string>
-  <string name="caches_filter_size_regular">normalna</string>
-  <string name="caches_filter_size_large">duża</string>
-  <string name="caches_filter_size_other">inna</string>
-  <string name="caches_filter_size_virtual">wirtualna</string>
-  <string name="caches_filter_size_notchosen">nie wybrana</string>
   <string name="caches_filter_type_title">Wybierz typ</string>
   <string name="caches_filter_type_traditional">tradycyjna</string>
   <string name="caches_filter_type_multi">wieloetapowa</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 45ce836..2314827 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak hq</string>
   <string name="gps">Cache exposição GPS</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">pequena</string>
+  <string name="cache_size_regular">normal</string>
+  <string name="cache_size_large">grande</string>
+  <string name="cache_size_other">outra</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">não especificado</string>
+
   <!-- waypoints -->
   <string name="wp_final">Localização final</string>
   <string name="wp_stage">Estado da multi-cache</string>
@@ -314,13 +323,6 @@
   <string name="caches_filter_track">com trackables</string>
   <string name="caches_filter_clear">Limpar filtros</string>
   <string name="caches_filter_size_title">Escolha o tamanho</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">pequena</string>
-  <string name="caches_filter_size_regular">normal</string>
-  <string name="caches_filter_size_large">grande</string>
-  <string name="caches_filter_size_other">outra</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">não especificado</string>
   <string name="caches_filter_type_title">Escolha o tipo</string>
   <string name="caches_filter_type_traditional">Cache tradicional</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0e5b25b..283fe8d 100755
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak HQ</string>
   <string name="gps">GPS cache utställning</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">small</string>
+  <string name="cache_size_regular">regular</string>
+  <string name="cache_size_large">large</string>
+  <string name="cache_size_other">other</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">not chosen</string>
+
   <!-- waypoints -->
   <string name="wp_final">Slutlig plats</string>
   <string name="wp_stage">Delsteg för multi-cache</string>
@@ -318,13 +327,6 @@
   <string name="caches_filter_track">med trackables</string>
   <string name="caches_filter_clear">rensa filter</string>
   <string name="caches_filter_size_title">Välj storlek</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">small</string>
-  <string name="caches_filter_size_regular">regular</string>
-  <string name="caches_filter_size_large">large</string>
-  <string name="caches_filter_size_other">other</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">ej vald</string>
   <string name="caches_filter_type_title">Välj typ</string>
   <string name="caches_filter_type_traditional">Traditionell cache</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c2bc1b5..93b945c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,6 +36,15 @@
   <string name="gchq">Groundspeak hq</string>
   <string name="gps">GPS cache exhibit</string>
 
+  <!-- cache sizes -->
+  <string name="cache_size_micro">micro</string>
+  <string name="cache_size_small">small</string>
+  <string name="cache_size_regular">regular</string>
+  <string name="cache_size_large">large</string>
+  <string name="cache_size_other">other</string>
+  <string name="cache_size_virtual">virtual</string>
+  <string name="cache_size_notchosen">not chosen</string>
+
   <!-- waypoints -->
   <string name="wp_final">Final location</string>
   <string name="wp_stage">Stage of multi-cache</string>
@@ -321,13 +330,6 @@
   <string name="caches_filter_track">with trackables</string>
   <string name="caches_filter_clear">clear filters</string>
   <string name="caches_filter_size_title">Choose size</string>
-  <string name="caches_filter_size_micro">micro</string>
-  <string name="caches_filter_size_small">small</string>
-  <string name="caches_filter_size_regular">regular</string>
-  <string name="caches_filter_size_large">large</string>
-  <string name="caches_filter_size_other">other</string>
-  <string name="caches_filter_size_virtual">virtual</string>
-  <string name="caches_filter_size_notchosen">not chosen</string>
   <string name="caches_filter_type_title">Choose type</string>
   <string name="caches_filter_type_traditional">Traditional cache</string>
   <string name="caches_filter_type_multi">Multi-cache</string>
diff --git a/src/cgeo/geocaching/cgCacheListAdapter.java b/src/cgeo/geocaching/cgCacheListAdapter.java
index a3563b0..98b5e5b 100644
--- a/src/cgeo/geocaching/cgCacheListAdapter.java
+++ b/src/cgeo/geocaching/cgCacheListAdapter.java
@@ -596,7 +596,7 @@ public class cgCacheListAdapter extends ArrayAdapter<cgCache> {
                 if (cacheInfo.length() > 0) {
                     cacheInfo.append(" | ");
                 }
-                cacheInfo.append(cache.size.id);
+                cacheInfo.append(res.getString(cache.size.stringId));
             }
             if ((cache.difficulty != null && cache.difficulty > 0f) || (cache.terrain != null && cache.terrain > 0f) || (cache.rating != null && cache.rating > 0f)) {
                 if (cacheInfo.length() > 0 && ((cache.difficulty != null && cache.difficulty > 0f) || (cache.terrain != null && cache.terrain > 0f))) {
diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java
index d8e6d84..fdcc79b 100644
--- a/src/cgeo/geocaching/cgeocaches.java
+++ b/src/cgeo/geocaching/cgeocaches.java
@@ -1086,13 +1086,13 @@ public class cgeocaches extends AbstractListActivity {
 
             if (selectedFilter.equals(res.getString(R.string.caches_filter_size))) {
                 menu.setHeaderTitle(res.getString(R.string.caches_filter_size_title));
-                menu.add(0, MENU_FILTER_SIZE_MICRO, 0, res.getString(R.string.caches_filter_size_micro));
-                menu.add(0, MENU_FILTER_SIZE_SMALL, 0, res.getString(R.string.caches_filter_size_small));
-                menu.add(0, MENU_FILTER_SIZE_REGULAR, 0, res.getString(R.string.caches_filter_size_regular));
-                menu.add(0, MENU_FILTER_SIZE_LARGE, 0, res.getString(R.string.caches_filter_size_large));
-                menu.add(0, MENU_FILTER_SIZE_OTHER, 0, res.getString(R.string.caches_filter_size_other));
-                menu.add(0, MENU_FILTER_SIZE_VIRTUAL, 0, res.getString(R.string.caches_filter_size_virtual));
-                menu.add(0, MENU_FILTER_SIZE_NOT_CHOSEN, 0, res.getString(R.string.caches_filter_size_notchosen));
+                menu.add(0, MENU_FILTER_SIZE_MICRO, 0, res.getString(CacheSize.MICRO.stringId));
+                menu.add(0, MENU_FILTER_SIZE_SMALL, 0, res.getString(CacheSize.SMALL.stringId));
+                menu.add(0, MENU_FILTER_SIZE_REGULAR, 0, res.getString(CacheSize.REGULAR.stringId));
+                menu.add(0, MENU_FILTER_SIZE_LARGE, 0, res.getString(CacheSize.LARGE.stringId));
+                menu.add(0, MENU_FILTER_SIZE_OTHER, 0, res.getString(CacheSize.OTHER.stringId));
+                menu.add(0, MENU_FILTER_SIZE_VIRTUAL, 0, res.getString(CacheSize.VIRTUAL.stringId));
+                menu.add(0, MENU_FILTER_SIZE_NOT_CHOSEN, 0, res.getString(CacheSize.NOT_CHOSEN.stringId));
             } else if (selectedFilter.equals(res.getString(R.string.caches_filter_type))) {
                 menu.setHeaderTitle(res.getString(R.string.caches_filter_type_title));
                 menu.add(0, MENU_FILTER_TYPE_TRADITIONAL, 0, res.getString(R.string.caches_filter_type_traditional));
diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java
index f8513e1..ac6fc00 100644
--- a/src/cgeo/geocaching/cgeodetail.java
+++ b/src/cgeo/geocaching/cgeodetail.java
@@ -668,7 +668,7 @@ public class cgeodetail extends AbstractActivity {
             if (cache.size != null) {
                 // don't show "not chosen" for events, that should be the normal case
                 if (!(cache.isEventCache() && cache.size == CacheSize.NOT_CHOSEN)) {
-                    size = " (" + cache.size.id + ")";
+                    size = " (" + res.getString(cache.size.stringId) + ")";
                 }
             }
 
diff --git a/src/cgeo/geocaching/cgeopopup.java b/src/cgeo/geocaching/cgeopopup.java
index af5cd56..b5eff42 100644
--- a/src/cgeo/geocaching/cgeopopup.java
+++ b/src/cgeo/geocaching/cgeopopup.java
@@ -239,13 +239,15 @@ public class cgeopopup extends AbstractActivity {
             itemName.setText(res.getString(R.string.cache_type));
             if (cgBase.cacheTypesInv.containsKey(cache.type)) { // cache icon
                 if (cache.size != null) {
-                    itemValue.setText(cgBase.cacheTypesInv.get(cache.type) + " (" + cache.size.id + ")");
+                    itemValue.setText(cgBase.cacheTypesInv.get(cache.type)
+                            + " (" + res.getString(cache.size.stringId) + ")");
                 } else {
                     itemValue.setText(cgBase.cacheTypesInv.get(cache.type));
                 }
             } else {
                 if (cache.size != null) {
-                    itemValue.setText(cgBase.cacheTypesInv.get("mystery") + " (" + cache.size.id + ")");
+                    itemValue.setText(cgBase.cacheTypesInv.get("mystery")
+                            + " (" + res.getString(cache.size.stringId) + ")");
                 } else {
                     itemValue.setText(cgBase.cacheTypesInv.get("mystery"));
                 }
diff --git a/src/cgeo/geocaching/enumerations/CacheSize.java b/src/cgeo/geocaching/enumerations/CacheSize.java
index 44d6377..b690b7c 100644
--- a/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -12,13 +12,13 @@ import java.util.Map;
  * @author koem
  */
 public enum CacheSize {
-    MICRO("micro", 1, R.string.caches_filter_size_micro),
-    SMALL("small", 2, R.string.caches_filter_size_small),
-    REGULAR("regular", 3, R.string.caches_filter_size_regular),
-    LARGE("large", 4, R.string.caches_filter_size_large),
-    VIRTUAL("virtual", 0, R.string.caches_filter_size_virtual),
-    NOT_CHOSEN("not chosen", 0, R.string.caches_filter_size_notchosen),
-    OTHER("other", 0, R.string.caches_filter_size_other);
+    MICRO("micro", 1, R.string.cache_size_micro),
+    SMALL("small", 2, R.string.cache_size_small),
+    REGULAR("regular", 3, R.string.cache_size_regular),
+    LARGE("large", 4, R.string.cache_size_large),
+    VIRTUAL("virtual", 0, R.string.cache_size_virtual),
+    NOT_CHOSEN("not chosen", 0, R.string.cache_size_notchosen),
+    OTHER("other", 0, R.string.cache_size_other);
 
     public final String id;
     public final int comparable;