aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-01-06 19:40:06 +0100
committerBananeweizen <bananeweizen@gmx.de>2013-01-06 19:40:06 +0100
commit55447b57ab4c34c28e8af900c2ec8f74918f111c (patch)
treeb67e1ed2968acdb7df6c391b3e304df82759a986
parent4302a5521d410a3fb9f387dbedf0636d6f536f5a (diff)
downloadcgeo-55447b57ab4c34c28e8af900c2ec8f74918f111c.zip
cgeo-55447b57ab4c34c28e8af900c2ec8f74918f111c.tar.gz
cgeo-55447b57ab4c34c28e8af900c2ec8f74918f111c.tar.bz2
remove outdated icon update message
* otherwise it is shown for OC caches incorrectly * users should have migrated all old GC caches since a long time
-rw-r--r--main/res/values-cs/strings.xml1
-rw-r--r--main/res/values-de/strings.xml1
-rw-r--r--main/res/values-fr/strings.xml1
-rw-r--r--main/res/values-hu/strings.xml1
-rw-r--r--main/res/values-it/strings.xml1
-rw-r--r--main/res/values-ja/strings.xml1
-rw-r--r--main/res/values-nl/strings.xml1
-rw-r--r--main/res/values-pt/strings.xml1
-rw-r--r--main/res/values-sk/strings.xml1
-rw-r--r--main/res/values-sv/strings.xml1
-rw-r--r--main/res/values/strings.xml1
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java8
12 files changed, 1 insertions, 18 deletions
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index c89cf82..e103b69 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -411,7 +411,6 @@
<string name="cache_offline_time_days">dny</string>
<string name="cache_premium">placený účet</string>
<string name="cache_attributes">atributy</string>
- <string name="cache_attributes_no_icons">(obnov cache ke zobrazení atributů)</string>
<string name="cache_inventory">Inventář</string>
<string name="cache_log_offline">offline log</string>
<string name="cache_log_images_loading">Načítám obrázky z logů…</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index e226598..ed9d669 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -483,7 +483,6 @@
<string name="cache_offline_time_days">Tagen</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attribute</string>
- <string name="cache_attributes_no_icons">(aktualisiere den Cache um die Attribut-Icons anzuzeigen)</string>
<string name="cache_inventory">Inventar</string>
<string name="cache_log_offline">Offline-Log</string>
<string name="cache_log_images_loading">Lade Logbild…</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 41a4600..d75d8b4 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -468,7 +468,6 @@
<string name="cache_offline_time_days">jours</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attributs</string>
- <string name="cache_attributes_no_icons">(recharger la cache pour voir les icônes des attributs)</string>
<string name="cache_inventory">Inventaire</string>
<string name="cache_log_offline">Visite hors-ligne</string>
<string name="cache_log_images_loading">Chargement de l\'image de la visite…</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index b4f59c7..94da99f 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -483,7 +483,6 @@
<string name="cache_offline_time_days">nappal ezelőtt</string>
<string name="cache_premium">Prémium</string>
<string name="cache_attributes">Tulajdonságok</string>
- <string name="cache_attributes_no_icons">(frissítsd a ládát, hogy lásd a tulajdonság ikonokat)</string>
<string name="cache_inventory">Tárgyak</string>
<string name="cache_log_offline">Offline bejegyzés</string>
<string name="cache_log_images_loading">Bejegyzés kép betöltése…</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index a60cde2..f4eef62 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -468,7 +468,6 @@
<string name="cache_offline_time_days">giorni fa</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attributi</string>
- <string name="cache_attributes_no_icons">(aggiorna il cache per visualizzare le icone degli attributi)</string>
<string name="cache_inventory">Oggetti</string>
<string name="cache_log_offline">Log Offline</string>
<string name="cache_log_images_loading">Caricamento immagini log…</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 83aae5e..00b7c61 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -476,7 +476,6 @@
<string name="cache_offline_time_days">日前</string>
<string name="cache_premium">プレミアム会員</string>
<string name="cache_attributes">属性</string>
- <string name="cache_attributes_no_icons">(属性アイコンを表示するためにはキャッシュ情報を更新してください)</string>
<string name="cache_inventory">目録</string>
<string name="cache_log_offline">オフラインログ</string>
<string name="cache_log_images_loading">添付画像をロード中…</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 9502d3e..48de4aa 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -448,7 +448,6 @@
<string name="cache_offline_time_days">dagen geleden</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attributen</string>
- <string name="cache_attributes_no_icons">(herlaad cache om attribuut-iconen weer te geven)</string>
<string name="cache_inventory">Inventaris</string>
<string name="cache_log_offline">Offline log</string>
<string name="cache_log_images_loading">Laden van logafbeeldingen…</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 9516927..d8acac3 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -484,7 +484,6 @@
<string name="cache_offline_time_days">dias atrás</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Atributos</string>
- <string name="cache_attributes_no_icons">(actualize a cache para mostrar os ícones dos atributos)</string>
<string name="cache_inventory">Inventário</string>
<string name="cache_log_offline">Registo Offline</string>
<string name="cache_log_images_loading">A carregar imagem do registo…</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index fe2ca66..0593da5 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -483,7 +483,6 @@
<string name="cache_offline_time_days">pred dňami</string>
<string name="cache_premium">platený účet</string>
<string name="cache_attributes">Atribúty</string>
- <string name="cache_attributes_no_icons">(obnoví skrýšu pre zobrazenie ikon atribútov)</string>
<string name="cache_inventory">Obsah</string>
<string name="cache_log_offline">Offline log</string>
<string name="cache_log_images_loading">Načítanie obrázku z logu…</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 72b613d..02f8445 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -482,7 +482,6 @@
<string name="cache_offline_time_days">dagar sedan</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attribut</string>
- <string name="cache_attributes_no_icons">(uppdatera cachen för att visa bilder för attribut)</string>
<string name="cache_inventory">Innehåll</string>
<string name="cache_log_offline">Offline logg</string>
<string name="cache_log_images_loading">Laddar loggbilder…</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index c1ae45d..aa62532 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -493,7 +493,6 @@
<string name="cache_offline_time_days">days ago</string>
<string name="cache_premium">Premium</string>
<string name="cache_attributes">Attributes</string>
- <string name="cache_attributes_no_icons">(refresh cache to show attribute icons)</string>
<string name="cache_inventory">Inventory</string>
<string name="cache_log_offline">Offline Log</string>
<string name="cache_log_images_loading">Loading Log images…</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 2b64924..03759d0 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -905,9 +905,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
private ViewGroup attributeDescriptionsLayout; // layout for attribute descriptions
private boolean attributesShowAsIcons = true; // default: show icons
/**
- * True, if the cache was imported with an older version of c:geo.
- * These older versions parsed the attribute description from the tooltip in the web
- * page and put them into the DB. No icons can be matched for these.
+ * If the cache is from a non GC source, it might be without icons. Disable switching in those cases.
*/
private boolean noAttributeIconsFound = false;
private int attributeBoxMaxWidth;
@@ -1076,10 +1074,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
buffer.append(attributeName);
}
- if (noAttributeIconsFound) {
- buffer.append("\n\n").append(res.getString(R.string.cache_attributes_no_icons));
- }
-
attribView.setText(buffer);
return descriptions;