From 7724ac89e4fbf295c43afccff7b513327eed5892 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Tue, 27 Nov 2012 17:38:41 +0100 Subject: refactoring: have non translatable strings separated --- cgeo-calendar/AndroidManifest.xml | 2 +- cgeo-calendar/lint.xml | 4 + .../src/cgeo/calendar/AbstractAddEntry.java | 1 + main/lint.xml | 4 + main/res/values-de/strings.xml | 3 - main/res/values-hu/strings.xml | 4 - main/res/values-it/strings.xml | 2 - main/res/values-ja/strings.xml | 8 -- main/res/values-pt/strings.xml | 1 - main/res/values-sk/strings.xml | 1 - main/res/values-sv/strings.xml | 4 - main/res/values/cache_attributes.xml | 2 +- main/res/values/strings.xml | 141 -------------------- main/res/values/strings_not_translatable.xml | 148 +++++++++++++++++++++ main/templates/mapsapikey.xml | 2 +- 15 files changed, 160 insertions(+), 167 deletions(-) create mode 100644 cgeo-calendar/lint.xml create mode 100644 main/lint.xml create mode 100644 main/res/values/strings_not_translatable.xml diff --git a/cgeo-calendar/AndroidManifest.xml b/cgeo-calendar/AndroidManifest.xml index 71aa71e..7c2d3a7 100644 --- a/cgeo-calendar/AndroidManifest.xml +++ b/cgeo-calendar/AndroidManifest.xml @@ -17,7 +17,7 @@ + android:label="@string/app_name" android:allowBackup="false"> + + + \ No newline at end of file diff --git a/cgeo-calendar/src/cgeo/calendar/AbstractAddEntry.java b/cgeo-calendar/src/cgeo/calendar/AbstractAddEntry.java index 99bd6d0..2860625 100644 --- a/cgeo-calendar/src/cgeo/calendar/AbstractAddEntry.java +++ b/cgeo-calendar/src/cgeo/calendar/AbstractAddEntry.java @@ -16,6 +16,7 @@ abstract class AbstractAddEntry { void addEntryToCalendar() { try { addEntryToCalendarInternal(); + activity.showToast(R.string.event_success); } catch (Exception e) { activity.showToast(R.string.event_fail); diff --git a/main/lint.xml b/main/lint.xml new file mode 100644 index 0000000..8a7b1fa --- /dev/null +++ b/main/lint.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 43ae973..3b6086a 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -427,9 +427,6 @@ Kartenherkunft Hier kann die Quelle der benutzten Karte gewählt werden. Alternativ zu Google Maps stehen verschiedene OpenStreetMap-Stile zur Verfügung und daneben auch Karten-Dateien für die Offline-Nutzung (siehe http://code.google.com/p/mapsforge/ für die Details).\nWeiterhin werden verschiedene Darstellungen(Themes) für Offline-Karten unterstützt. Kartenquelle wählen - … - … - … Verzeichnis mit Offline-Karten Verzeichnis für GPX-Exporte Verzeichnis für GPX-Importe diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 1b8560a..4d8eeff 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -428,11 +428,7 @@ Térkép források Itt választhatod ki a térképeid forrását. A Google térképek alternatívájaként több OpenStreetMap stílus is hozzáférhető és offline térkép fájlokat is használhatsz. (További információ http://code.google.com/p/mapsforge/). Válassz térkép forrást - … Könyvtár az offline térképekhez - … - … - … GPX exportálási könyvtár GPX importálási könyvtár Itt választhatod ki a könyvtárat a GPX exportálásokhoz. diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index b88a6c1..9f22c09 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -422,8 +422,6 @@ Tipi di mappe Qui puoi scegliere dove c:geo preleverà le mappe. Come alternativa a Google maps esistono vari stili di OpenStreetMap disponibili anche per uso offline (vedi http://code.google.com/p/mapsforge/ per dettagli). Seleziona il tipo di mappa - … - … Cartella di export GPX Cartella di import GPX Qui puoi selezionare la cartella di esportazione GPX. diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 46cfae6..55f080b 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -426,8 +426,6 @@ 地図の設定 オンライン地図をGoogleマップからOpenStreetMap(その派生オンライン地図やオフライン地図)に変更できます。詳細はhttp://code.google.com/p/mapsforge/ (英語)をご覧ください。 地図の選択 - 選択… - 選択… GPXエクスポートフォルダ GPXインポートフォルダ GPXファイルへエクスポートする際の保存先フォルダを選択できます。 @@ -689,12 +687,6 @@ 全履歴を削除 全履歴を削除しました - - @string/waypoint_coordinate_formats_plain - DDD.DDDDD° - DDD°MM.MMM\' - DDD°MM\'SS.SSS\" - プレーン diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 3781159..9593d7e 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -585,7 +585,6 @@ WhereYouGo OruxMaps Cache Beacon - Sygic Estado Log gravado Encontrada diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index a901e5f..52a9f62 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -425,7 +425,6 @@ Mapové zdroje Tu môžete vybrať zdroje pre vaše mapy. Je to alternatíva ku Google mapám rôznych OpenStreetMap styles sú dostupné a dokonca offline mapové súbory (podrobnosti nájdete na http://code.google.com/p/mapsforge/). Vyberte zdroj máp - … Adresár pre GPX Export Tu si môžete vybrať adresár pre GPX exporty. Výber adresára pre GPX Export diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 6c11376..853ee2a 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -427,11 +427,7 @@ Kartkällor Här kan du vilken typ av kartor du vill använda. Som alternativ till Google Maps finns olika varianter av OpenStreetMap och till och med offline kartor (se http://code.google.com/p/mapsforge/ för detaljer). Välj kartkälla - … Katalog med offline kartor - … - … - … GPX-exportkatalog GPX-importkatalog Här kan du välja katalog för GPX-exporteringar. diff --git a/main/res/values/cache_attributes.xml b/main/res/values/cache_attributes.xml index 3277a42..815e007 100644 --- a/main/res/values/cache_attributes.xml +++ b/main/res/values/cache_attributes.xml @@ -1,6 +1,6 @@ - + dogs_yes dogs_no bicycles_yes diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 39b17f2..23497a5 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -428,11 +428,7 @@ Map Sources Here you can select the source for your maps. As an alternative to Google maps various OpenStreetMap styles are available and even offline map files (See http://code.google.com/p/mapsforge/ for details).\nFurthermore selectable themes for offline maps are supported. Select Map Source - … Directory with offline maps - … - … - … GPX Export Directory GPX Import Directory Here you can select the directory for GPX exports. @@ -464,13 +460,6 @@ Directory with custom offline map themes (optional) - - @string/map_source_google_map - @string/map_source_google_satellite - @string/map_source_osm_mapnik - @string/map_source_osm_cyclemap - @string/map_source_osm_offline - Google: Map Google: Satellite OSM: Mapnik @@ -714,22 +703,9 @@ Clear History History cleared - - @string/waypoint_coordinate_formats_plain - DDD.DDDDD° - DDD°MM.MMM\' - DDD°MM\'SS.SSS\" - Plain - - @string/unit_m - @string/unit_km - @string/unit_ft - @string/unit_yd - @string/unit_mi - m km ft @@ -1041,121 +1017,4 @@ yesterday %d days ago - - - - - \n - · carnero as the father of c:geo\n - \n - · 0xErnie (localization DE)\n - · Balazs Szabo (Bazsy1983) (loc. HU)\n - · Bananeweizen (code, loc. DE)\n - · blafoo (code, localization DE)\n - · Bonemaro (tester)\n - · BudBundi (localization DE, tester)\n - · campbeb (code)\n - · Charles (localization FR)\n - · Denny (localization DA)\n - · Eisbehr (code)\n - · F. Coello (localization ES)\n - · Filipe C. (code)\n - · Hunter275 (tester)\n - · Iiro Jäppinen (graphic)\n - · inkantis (localization PL)\n - · Jan Žatecký (graphic)\n - · JoWi24 (code)\n - · Karsten Priegnitz (code, artwork computation)\n - · Lineflyer (tester, support, localization DE)\n - · Ludovic Valente (localization FR)\n - · marco-jacob (code, loc. DE)\n - · MichielK (code, loc. NL)\n - · mucek4 (code, open source project leader)\n - · ncorreia (code, localization PT)\n - · Pascal (localization NL)\n - · Pavol Babinčák (code, loc. SK)\n - · Peter (localization HU)\n - · Portree Kid (code)\n - · Rainer S. (code)\n - · Ray (code, loc. JA)\n - · Ricardo Seromenho (localization PT)\n - · RoadRunner- (code, loc. DE)\n - · RomNexus6 (localization IT)\n - · SammysHP (code, localization DE)\n - · Samuel Tardieu (code, localization FR)\n - · serenity (localization DE)\n - · Shan, a.k.a. ShakurNO (localization NO)\n - · Shizo87 (tester)\n - · stephanme/Geoteufel (code)\n - · thiasB (code, loc. DE EN)\n - · YraFyra (code, loc. SV)\n - · zenobios (code, loc. DE EN)\n - \n - · Mapsforge (OSM-rendering)\n - · The Noun Project (basis for attribute icons)\n - · The Apache Commons Project\n - · Android Icons (CC-BY 3.0)\n - · RRZE Icon set (CC-BY-SA 3.0)\n - - - - \n - Next release\n\n - New Features/Functions:\n - · If static maps are enabled, batch update of caches will now update caches without static maps first\n - · If a cache has a chirp attribute the navigation menu supports starting the Cache Beacon app\n - · Search bar on main screen now allows searching OC geocodes\n - · Removed Go4Cache support as this third party service is no longer available\n - · Selectable GPX import directory\n - · New log template for inserting owner name\n - · New option to remove colors from log entries\n - · Ability to delete GPX files after import\n - · Quick signature insertion\n - · Template for inserting smilies when logging a cache\n - · Option to identify as android browser. Might help in case of login problems on mobile networks\n - · Create and edit a personal note for each cache (not yet synchronized to geocaching.com)\n - · Quick change between different offline maps within live map\n - · Support of custom themes for offline maps (e.g. nightview)\n - · Sygic navigation support\n - · Filter for non premium member caches\n - · New image tab in cache details\n - \n - Bugfixing:\n - · Crash when modifying lists fixed\n - · Improvement for cache description translation\n - · Avoid crash when searching for an unactivated TB\n - · Improvement for enabling live mode on map\n - · Improvement for GPX export operations\n - · Readability improvement for cache description with dark text when using black theme\n - · Store for offline on live map now always available for basic members\n - · Live map now stays live after display rotation\n - · Open in browser improved to allow setting a default browser without losing the option to open coord.info URLs with c:geo\n - · Improve offline stability\n - · Static map download improvements\n - · Failure when importing previously exported GPX file fixed\n - · Opening a link from a TB description improved\n - · Last activity time on TB page corrected\n - · 4-digit favorite points shown correctly in lists\n - · File scan for offline maps improved\n - · Allow HTML in trackable description\n - · Live map filter now also working for basic members\n - · Improved stability for large GPX file import\n - \n - Detailed list of all changes\n - \n - Known Limitations/Bugs:\n - · Live map:\n - Approximated coords due to limitations on the GC-website\n - Be aware: If navigation is started directly from live map it may also use the approximated coords!\n - In fast mode the cache type might be wrong in rare cases\n - Fast mode only detectes Tradi, Multi, Mystery, Event caches\n - On low zoom owned/found caches may not be hidden anymore\n - · Other:\n - Log images with huge size cause a long loading time\n - In special situations the logbook might not be shown completely after logging a cache\n - The personal note added to a cache is not synced to geocaching.com but will be overruled by personal notes on geocaching.com\n - On devices with HD display resolution OSM maps might not work. Please use Google maps in this case.\n - Old releases\n - · Please refer to the release notes on the c:geo-website.\n - \n diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml new file mode 100644 index 0000000..687fa39 --- /dev/null +++ b/main/res/values/strings_not_translatable.xml @@ -0,0 +1,148 @@ + + + + + @string/map_source_google_map + @string/map_source_google_satellite + @string/map_source_osm_mapnik + @string/map_source_osm_cyclemap + @string/map_source_osm_offline + + + + @string/waypoint_coordinate_formats_plain + DDD.DDDDD° + DDD°MM.MMM\' + DDD°MM\'SS.SSS\" + + + + + @string/unit_m + @string/unit_km + @string/unit_ft + @string/unit_yd + @string/unit_mi + + + … + … + … + … + + + \n + · carnero as the father of c:geo\n + \n + · 0xErnie (localization DE)\n + · Balazs Szabo (Bazsy1983) (loc. HU)\n + · Bananeweizen (code, loc. DE)\n + · blafoo (code, localization DE)\n + · Bonemaro (tester)\n + · BudBundi (localization DE, tester)\n + · campbeb (code)\n + · Charles (localization FR)\n + · Denny (localization DA)\n + · Eisbehr (code)\n + · F. Coello (localization ES)\n + · Filipe C. (code)\n + · Hunter275 (tester)\n + · Iiro Jäppinen (graphic)\n + · inkantis (localization PL)\n + · Jan Žatecký (graphic)\n + · JoWi24 (code)\n + · Karsten Priegnitz (code, artwork computation)\n + · Lineflyer (tester, support, localization DE)\n + · Ludovic Valente (localization FR)\n + · marco-jacob (code, loc. DE)\n + · MichielK (code, loc. NL)\n + · mucek4 (code, open source project leader)\n + · ncorreia (code, localization PT)\n + · Pascal (localization NL)\n + · Pavol Babinčák (code, loc. SK)\n + · Peter (localization HU)\n + · Portree Kid (code)\n + · Rainer S. (code)\n + · Ray (code, loc. JA)\n + · Ricardo Seromenho (localization PT)\n + · RoadRunner- (code, loc. DE)\n + · RomNexus6 (localization IT)\n + · SammysHP (code, localization DE)\n + · Samuel Tardieu (code, localization FR)\n + · serenity (localization DE)\n + · Shan, a.k.a. ShakurNO (localization NO)\n + · Shizo87 (tester)\n + · stephanme/Geoteufel (code)\n + · thiasB (code, loc. DE EN)\n + · YraFyra (code, loc. SV)\n + · zenobios (code, loc. DE EN)\n + \n + · Mapsforge (OSM-rendering)\n + · The Noun Project (basis for attribute icons)\n + · The Apache Commons Project\n + · Android Icons (CC-BY 3.0)\n + · RRZE Icon set (CC-BY-SA 3.0)\n + + + + \n + Next release\n\n + New Features/Functions:\n + · If static maps are enabled, batch update of caches will now update caches without static maps first\n + · If a cache has a chirp attribute the navigation menu supports starting the Cache Beacon app\n + · Search bar on main screen now allows searching OC geocodes\n + · Removed Go4Cache support as this third party service is no longer available\n + · Selectable GPX import directory\n + · New log template for inserting owner name\n + · New option to remove colors from log entries\n + · Ability to delete GPX files after import\n + · Quick signature insertion\n + · Template for inserting smilies when logging a cache\n + · Option to identify as android browser. Might help in case of login problems on mobile networks\n + · Create and edit a personal note for each cache (not yet synchronized to geocaching.com)\n + · Quick change between different offline maps within live map\n + · Support of custom themes for offline maps (e.g. nightview)\n + · Sygic navigation support\n + · Filter for non premium member caches\n + · New image tab in cache details\n + \n + Bugfixing:\n + · Crash when modifying lists fixed\n + · Improvement for cache description translation\n + · Avoid crash when searching for an unactivated TB\n + · Improvement for enabling live mode on map\n + · Improvement for GPX export operations\n + · Readability improvement for cache description with dark text when using black theme\n + · Store for offline on live map now always available for basic members\n + · Live map now stays live after display rotation\n + · Open in browser improved to allow setting a default browser without losing the option to open coord.info URLs with c:geo\n + · Improve offline stability\n + · Static map download improvements\n + · Failure when importing previously exported GPX file fixed\n + · Opening a link from a TB description improved\n + · Last activity time on TB page corrected\n + · 4-digit favorite points shown correctly in lists\n + · File scan for offline maps improved\n + · Allow HTML in trackable description\n + · Live map filter now also working for basic members\n + · Improved stability for large GPX file import\n + \n + Detailed list of all changes\n + \n + Known Limitations/Bugs:\n + · Live map:\n + Approximated coords due to limitations on the GC-website\n + Be aware: If navigation is started directly from live map it may also use the approximated coords!\n + In fast mode the cache type might be wrong in rare cases\n + Fast mode only detectes Tradi, Multi, Mystery, Event caches\n + On low zoom owned/found caches may not be hidden anymore\n + · Other:\n + Log images with huge size cause a long loading time\n + In special situations the logbook might not be shown completely after logging a cache\n + The personal note added to a cache is not synced to geocaching.com but will be overruled by personal notes on geocaching.com\n + On devices with HD display resolution OSM maps might not work. Please use Google maps in this case.\n + Old releases\n + · Please refer to the release notes on the c:geo-website.\n + \n + + \ No newline at end of file diff --git a/main/templates/mapsapikey.xml b/main/templates/mapsapikey.xml index 5514121..3655b5e 100644 --- a/main/templates/mapsapikey.xml +++ b/main/templates/mapsapikey.xml @@ -1,4 +1,4 @@ - @maps.api.key@ + @maps.api.key@ -- cgit v1.1