diff options
Diffstat (limited to 'main')
42 files changed, 552 insertions, 608 deletions
diff --git a/main/res/drawable-hdpi/actionbar_search.png b/main/res/drawable-hdpi/actionbar_search.png Binary files differdeleted file mode 100644 index 59de344..0000000 --- a/main/res/drawable-hdpi/actionbar_search.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_search.png b/main/res/drawable-ldpi/actionbar_search.png Binary files differdeleted file mode 100644 index f3ce1d9..0000000 --- a/main/res/drawable-ldpi/actionbar_search.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_search.png b/main/res/drawable-mdpi/actionbar_search.png Binary files differdeleted file mode 100644 index cce7789..0000000 --- a/main/res/drawable-mdpi/actionbar_search.png +++ /dev/null diff --git a/main/res/layout-land/coordinatesinput_dialog.xml b/main/res/layout-land/coordinatesinput_dialog.xml index 88e5e76..56e7923 100644 --- a/main/res/layout-land/coordinatesinput_dialog.xml +++ b/main/res/layout-land/coordinatesinput_dialog.xml @@ -5,13 +5,6 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <TextView - style="@style/action_bar_title" - android:text="@string/cache_coordinates" /> - </LinearLayout> - <ScrollView android:id="@+id/scroller" android:layout_width="fill_parent" diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml index c8a589f..58e070e 100644 --- a/main/res/layout/cachelist_spinneritem.xml +++ b/main/res/layout/cachelist_spinneritem.xml @@ -5,18 +5,18 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="?attr/dropdownListPreferredItemHeight" android:minHeight="?attr/dropdownListPreferredItemHeight" - style="?attr/spinnerDropDownItemStyle" android:layout_gravity="left|center_vertical" + style="?attr/spinnerDropDownItemStyle" > <TextView android:id="@android:id/text1" - android:textAppearance="?android:attr/textAppearanceMedium" tools:text="This is the title" android:singleLine="true" android:ellipsize="marquee" android:layout_width="match_parent" + style="?attr/titleTextStyle" android:layout_height="wrap_content" /> @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceSmall" + style="?attr/subtitleTextStyle" tools:text="This is the subtitle" android:id="@android:id/text2" /> diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml index 4603360..cc3e36f 100644 --- a/main/res/layout/coordinatesinput_dialog.xml +++ b/main/res/layout/coordinatesinput_dialog.xml @@ -5,13 +5,6 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <TextView - style="@style/action_bar_title" - android:text="@string/cache_coordinates" /> - </LinearLayout> - <ScrollView android:id="@+id/scroller" android:layout_width="fill_parent" diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml index 01ae5da..5e5b6a6 100644 --- a/main/res/menu/main_activity_options.xml +++ b/main/res/menu/main_activity_options.xml @@ -6,7 +6,7 @@ <item
android:id="@+id/menu_gosearch"
style="@style/action_bar_action"
- android:icon="@drawable/actionbar_search"
+ android:icon="@drawable/abc_ic_search"
android:title="@string/search_bar_hint"
cgeo:actionViewClass="android.support.v7.widget.SearchView"
cgeo:showAsAction="collapseActionView|always"/>
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml index a012433..8222624 100644 --- a/main/res/values-ca/strings.xml +++ b/main/res/values-ca/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Contrasenya d\'accés:</string> <string name="log_hint_log_password">Introduïu la contrasenya d\'accés</string> <string name="log_oc_team_comment">Comentari de l\'equip OC</string> + <string-array name="log_image_scales"> + <item>Sense escala</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Tradueix a %s</string> <string name="translate_to_english">Tradueix a l\'anglès</string> <string name="translate_length_warning">La traducció pot fallar amb una gran quantitat de text.</string> @@ -242,6 +249,10 @@ <string name="caches_more_caches_currently">actualment</string> <string name="caches_downloading">S\'estan descarregant els catxés…\nETA: </string> <string name="caches_eta_ltm">Menys d\'un minut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minut</item> + <item quantity="other">minuts</item> + </plurals> <string name="caches_store_offline">Desa per usar fora de línia</string> <string name="caches_store_selected">Desa els seleccionats</string> <string name="caches_history">Historial</string> @@ -404,6 +415,8 @@ <string name="init_signature_template_log">Text del registre</string> <string name="init_ratingwanted">Valoració del GCvote</string> <string name="init_summary_ratingwanted">Descarrega la valoració des de GCvote.com</string> + <string name="init_friends_and_own_logs_wanted">Mostra els dels amics i els propis</string> + <string name="init_summary_friends_and_own_logs_wanted">Visualitza una pàgina addicional del llibre de registre pels registres dels amics i els propis</string> <string name="init_openlastdetailspage">Obre l\'última pàgina de detalls</string> <string name="init_summary_openlastdetailspage">Obre els detalls amb l\'última pàgina utilitzada</string> <string name="init_autoload">Descripció llarga</string> @@ -524,7 +537,7 @@ <string name="init_sendToCgeo_description"><b>Send2c:geo</b> us permet enviar els catxés al vostre aparell Android directament des de Geocaching.com utilitzant un complement especial per al Firefox o pel Chrome. Abans de registrar-vos veieu <a href="http://send2.cgeo.org/"> http://send2.cgeo.org/</a>. Només cal que us registreu si voleu utilitzar el send2c:geo.</string> <string name="init_sendToCgeo_register">Sol·licita registre</string> <string name="init_sendToCgeo_registering">S\'està registrant el dispositiu per Send2c:geo…</string> - <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és # # #. Utilitzeu-lo al web del c:geo per connectar aquest dispositiu al navegador.</string> + <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és ####. Utilitzeu-lo al web del c:geo per connectar aquest dispositiu al navegador.</string> <string name="init_sendToCgeo_register_fail">S\'ha produït un error en el registre del sendToCgeo.</string> <string name="sendToCgeo_download_fail">El c:geo ha fallat al descarregar els catxés. No hi ha connexió a Internet o el send2c:geo no funciona.</string> <string name="sendToCgeo_no_registration">S\'ha produït un error descarregant els catxés. El registre a send2c:geo ha caducat. Registreu-vos de nou a la configuració.</string> @@ -542,6 +555,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">El c:geo ara està autoritzat a interactuar amb %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Un catxé</item> + <item quantity="other">%1$d catxés</item> + </plurals> <string name="cache_offline">Fora de línia</string> <string name="cache_offline_refresh">Actualitza</string> <string name="cache_offline_drop">Esborra</string> @@ -586,9 +603,14 @@ <string name="cache_list_unknown">No està a cap llista</string> <string name="cache_images">Imatges</string> <string name="cache_waypoints">Fites</string> + <plurals name="waypoints"> + <item quantity="one">1 fita</item> + <item quantity="other">%d fites</item> + </plurals> <string name="cache_waypoints_add">Afegeix una fita</string> <string name="cache_hint">Pista</string> <string name="cache_logs">Llibre de registre</string> + <string name="cache_logs_friends_and_own">Registres dels amics o propis</string> <string name="cache_dialog_loading_details">S\'està carregant els detalls del catxé…</string> <string name="cache_dialog_loading_details_status_loadpage">S\'està carregant la pàgina</string> <string name="cache_dialog_loading_details_status_details">S\'està processant els detalls</string> @@ -644,6 +666,7 @@ <string name="cache_status">Estat</string> <string name="cache_status_offline_log">Registre desat</string> <string name="cache_status_found">Trobat</string> + <string name="cache_not_status_found">No s\'ha trobat</string> <string name="cache_status_archived">Arxivat</string> <string name="cache_status_disabled">Desactivat</string> <string name="cache_status_premium">Només per membres Premium</string> @@ -1128,50 +1151,28 @@ <string name="tts_stop">Deixa de parlar</string> <string name="err_tts_lang_not_supported">La llengua actual no és compatible amb la síntesi de veu.</string> <string name="tts_one_kilometer">un quilòmetre</string> - <string name="tts_one_meter">un metre</string> - <string name="tts_one_mile">una milla</string> - <string name="tts_one_foot">un peu</string> - <string name="tts_one_oclock">la una en punt</string> - <string name="tts_oclock">%s en punt</string> - <string name="clipboard_copy_ok">S\'ha copiat al portapapers</string> - <string name="percent_favorite_points">% \ preferits</string> - <string name="cgeo_shortcut">Drecera del c:geo</string> - <string name="create_shortcut">Crea una drecera</string> - <string-array name="log_image_scales"> - <item>Sense escala</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minut</item> - <item quantity="other">minuts</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un catxé</item> - <item quantity="other">%1$d catxés</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 fita</item> - <item quantity="other">%d fites</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s quilòmetre</item> <item quantity="other">%s quilòmetres</item> </plurals> + <string name="tts_one_meter">un metre</string> <plurals name="tts_meters"> <item quantity="one">%s metre</item> <item quantity="other">%s metres</item> </plurals> + <string name="tts_one_mile">una milla</string> <plurals name="tts_miles"> <item quantity="one">%s milla</item> <item quantity="other">%s milles</item> </plurals> + <string name="tts_one_foot">un peu</string> <plurals name="tts_feet"> <item quantity="one">%s peu</item> <item quantity="other">%s peus</item> </plurals> + <string name="tts_one_oclock">la una en punt</string> + <string name="tts_oclock">%s en punt</string> + <string name="clipboard_copy_ok">S\'ha copiat al portapapers</string> <plurals name="days_ago"> <item quantity="one">ahir</item> <item quantity="other">fa %d dies</item> @@ -1180,4 +1181,7 @@ <item quantity="one">%s preferit</item> <item quantity="other">%s preferits</item> </plurals> + <string name="percent_favorite_points">% \ preferits</string> + <string name="cgeo_shortcut">Drecera del c:geo</string> + <string name="create_shortcut">Crea una drecera</string> </resources> diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 911f70e..ef01d59 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -120,6 +120,13 @@ <string name="log_password_title">Logovací heslo:</string> <string name="log_hint_log_password">Zadej své logovací heslo</string> <string name="log_oc_team_comment">Komentář týmu OC</string> + <string-array name="log_image_scales"> + <item>Bez měřítka</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Přeložit do %s</string> <string name="translate_to_english">Přeložit do angličtiny</string> <string name="translate_length_warning">Při velkém množství textu může překládání selhat.</string> @@ -240,6 +247,11 @@ <string name="caches_more_caches_currently">aktuálně</string> <string name="caches_downloading">Stahování keší…\nETA:</string> <string name="caches_eta_ltm">Méně než minutu</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="few">minuty</item> + <item quantity="other">minuty</item> + </plurals> <string name="caches_store_offline">Uložit pro offline</string> <string name="caches_store_selected">Uložit vybrané</string> <string name="caches_history">Historie</string> @@ -1135,16 +1147,4 @@ <string name="percent_favorite_points">%\ oblíbené</string> <string name="cgeo_shortcut">c:geo zástupce</string> <string name="create_shortcut">Vytvořit zástupce</string> - <string-array name="log_image_scales"> - <item>Bez měřítka</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="few">minuty</item> - <item quantity="other">minuty</item> - </plurals> </resources> diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index e3d3ba4..b0afd58 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -161,6 +161,10 @@ <string name="auth_authorize">Godkend c:geo</string> <string name="auth_start">Start godkendelse</string> <string name="auth_again">Start igen</string> + <plurals name="cache_counts"> + <item quantity="one">En cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Genindlæs</string> <string name="cache_offline_drop">Fjern</string> @@ -264,8 +268,4 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="about_twitter">Skal <b>c:geo</b> sende status til Twitter hvergang du logger en cache?</string> - <plurals name="cache_counts"> - <item quantity="one">En cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> </resources> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 78ff1a6..8ca0110 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Log-Passwort:</string> <string name="log_hint_log_password">Log-Passwort eingeben</string> <string name="log_oc_team_comment">OC Team Bemerkung</string> + <string-array name="log_image_scales"> + <item>Keine Skalierung</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Übersetze in %s</string> <string name="translate_to_english">Übersetze in Englisch</string> <string name="translate_length_warning">Die Übersetzung kann bei sehr langen Texten evtl. fehlschlagen.</string> @@ -221,6 +228,7 @@ <string name="loc_trying">Lokalisierung</string> <string name="loc_no_addr">Adresse unbekannt</string> <string name="loc_gps_disabled">GPS nicht aktiv</string> + <string name="menu_centerposition">Zentriere meine Position</string> <string name="menu_about">über c:geo</string> <string name="menu_helpers">Nützliche Apps</string> <string name="menu_settings">Einstellungen</string> @@ -242,6 +250,10 @@ <string name="caches_more_caches_currently">aktuell</string> <string name="caches_downloading">Lade Caches…\nGeschätzte Zeit: </string> <string name="caches_eta_ltm">Weniger als eine Minute</string> + <plurals name="caches_eta_mins"> + <item quantity="one">Minute</item> + <item quantity="other">Minuten</item> + </plurals> <string name="caches_store_offline">Für Offline speichern</string> <string name="caches_store_selected">Ausgewählte speichern</string> <string name="caches_history">Verlauf</string> @@ -417,6 +429,8 @@ <string name="init_captcha">Zeige CAPTCHA</string> <string name="init_summary_captcha">Zeige CAPTCHA wenn notwendig (nur Basic Member)</string> <string name="init_useenglish">Auf Englisch</string> + <string name="init_showoverflowmenu">Menü-Symbol immer anzeigen</string> + <string name="init_showoverflow_summary">Zeigt das Menü-Symbol (Drei Punkte ⋮) auch an wenn das Gerät eine Menütaste hat (Neustart benötigt)</string> <string name="init_summary_useenglish">c:geo auf Englisch nutzen (Neustart erforderlich)</string> <string name="init_exclude">Eigene und gefundene Caches</string> <string name="init_summary_exclude">Eigene und gefundene Caches ausblenden</string> @@ -494,6 +508,9 @@ <string name="init_maintenance">Wartung</string> <string name="init_maintenance_directories_note">c:geo speichert Bilder, Log-Bilder und weitere Dateien zu einem Cache in einem separaten Verzeichnis. In manchen Fällen (z.B. bei Sichern und Wiederherstellen der Datenbank) kann dieses Verzeichnis unnötige Daten enthalten, die gelöscht werden können.</string> <string name="init_maintenance_directories">Verwaiste Daten löschen</string> + <string name="init_create_memory_dump">Erzeuge ein Speicherabbild</string> + <string name="init_memory_dump">Speicherabbild</string> + <string name="init_memory_dumped">Speicherabbild in %s gespeichert</string> <string name="settings_open_website">Webseite öffnen</string> <string name="settings_settings">Einstellungen</string> <string name="settings_information">Information</string> @@ -541,6 +558,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo ist nun autorisiert, Caches zu laden und auf %s zu loggen.</string> + <plurals name="cache_counts"> + <item quantity="one">Ein Cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Aktualisieren</string> <string name="cache_offline_drop">Löschen</string> @@ -585,6 +606,10 @@ <string name="cache_list_unknown">In keiner Liste</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Wegpunkte</string> + <plurals name="waypoints"> + <item quantity="one">1 Wegpunkt</item> + <item quantity="other">%d Wegpunkte</item> + </plurals> <string name="cache_waypoints_add">Wegpunkt hinzufügen</string> <string name="cache_hint">Hinweis</string> <string name="cache_logs">Logbuch</string> @@ -1129,50 +1154,28 @@ <string name="tts_stop">Stoppe Sprache</string> <string name="err_tts_lang_not_supported">Die aktuelle Sprache wird von TTS nicht unterstützt.</string> <string name="tts_one_kilometer">ein Kilometer</string> - <string name="tts_one_meter">ein Meter</string> - <string name="tts_one_mile">eine Meile</string> - <string name="tts_one_foot">ein Fuß</string> - <string name="tts_one_oclock">ein Uhr</string> - <string name="tts_oclock">%s Uhr</string> - <string name="clipboard_copy_ok">In Zwischenablage kopiert</string> - <string name="percent_favorite_points">% Favoriten</string> - <string name="cgeo_shortcut">c:geo Shortcut</string> - <string name="create_shortcut">Shortcut erstellen</string> - <string-array name="log_image_scales"> - <item>Keine Skalierung</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">Minute</item> - <item quantity="other">Minuten</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Ein Cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Wegpunkt</item> - <item quantity="other">%d Wegpunkte</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s Kilometer</item> <item quantity="other">%s Kilometer</item> </plurals> + <string name="tts_one_meter">ein Meter</string> <plurals name="tts_meters"> <item quantity="one">%s Meter</item> <item quantity="other">%s Meter</item> </plurals> + <string name="tts_one_mile">eine Meile</string> <plurals name="tts_miles"> <item quantity="one">%s Meile</item> <item quantity="other">%s Meilen</item> </plurals> + <string name="tts_one_foot">ein Fuß</string> <plurals name="tts_feet"> <item quantity="one">%s Fuß</item> <item quantity="other">%s Fuß</item> </plurals> + <string name="tts_one_oclock">ein Uhr</string> + <string name="tts_oclock">%s Uhr</string> + <string name="clipboard_copy_ok">In Zwischenablage kopiert</string> <plurals name="days_ago"> <item quantity="one">gestern</item> <item quantity="other">vor %d Tagen</item> @@ -1181,4 +1184,7 @@ <item quantity="one">%s Favorit</item> <item quantity="other">%s Favoriten</item> </plurals> + <string name="percent_favorite_points">% Favoriten</string> + <string name="cgeo_shortcut">c:geo Shortcut</string> + <string name="create_shortcut">Shortcut erstellen</string> </resources> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 0946118..484d3ea 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -120,6 +120,13 @@ <string name="log_password_title">Contraseña:</string> <string name="log_hint_log_password">Introduzca su contraseña</string> <string name="log_oc_team_comment">Comentario equipo OC</string> + <string-array name="log_image_scales"> + <item>Sin redimensionar</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traducir al %s</string> <string name="translate_to_english">Traducir al inglés</string> <string name="translate_length_warning">La traducción podría fallar con un texto muy largo.</string> @@ -240,6 +247,10 @@ <string name="caches_more_caches_currently">actualmente</string> <string name="caches_downloading">Descargando escondites…\nFaltan: </string> <string name="caches_eta_ltm">Menos de un minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minutos</item> + </plurals> <string name="caches_store_offline">Usar sin conexión luego</string> <string name="caches_store_selected">Almacenamiento seleccionado</string> <string name="caches_history">Historial</string> @@ -462,6 +473,10 @@ <string name="auth_again">Volver a iniciar</string> <string name="auth_dialog_waiting">Esperando a %s…</string> <string name="auth_ocde">Opencaching.de</string> + <plurals name="cache_counts"> + <item quantity="one">Un escondite</item> + <item quantity="other">%1$d Escondites</item> + </plurals> <string name="cache_offline">Desconectado</string> <string name="cache_offline_refresh">Actualizar</string> <string name="cache_offline_drop">Tirar</string> @@ -848,19 +863,4 @@ <string name="tts_oclock">%s en punto</string> <string name="clipboard_copy_ok">Copiado al portapapeles</string> <string name="percent_favorite_points">% \ favoritos</string> - <string-array name="log_image_scales"> - <item>Sin redimensionar</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minutos</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un escondite</item> - <item quantity="other">%1$d Escondites</item> - </plurals> </resources> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 8e19cea..1ba049d 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Mot de passe du carnet :</string> <string name="log_hint_log_password">Entrez votre mot de passe pour le carnet</string> <string name="log_oc_team_comment">Commentaire de l\'équipe OC</string> + <string-array name="log_image_scales"> + <item>Taille originale</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduire en %s</string> <string name="translate_to_english">Traduire en anglais</string> <string name="translate_length_warning">La traduction d\'un texte trop long peut échouer.</string> @@ -241,6 +248,10 @@ <string name="caches_more_caches_currently">actuellement</string> <string name="caches_downloading">Téléchargement des caches…\nRestant: </string> <string name="caches_eta_ltm">Moins d\'une minute</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minute</item> + <item quantity="other">minutes</item> + </plurals> <string name="caches_store_offline">Stocker localement</string> <string name="caches_store_selected">Stocker la sélection</string> <string name="caches_history">Historique</string> @@ -537,6 +548,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo est désormais autorisé à interagir avec %s.</string> + <plurals name="cache_counts"> + <item quantity="one">une cache</item> + <item quantity="other">%1$d caches</item> + </plurals> <string name="cache_offline">Hors ligne</string> <string name="cache_offline_refresh">Recharger</string> <string name="cache_offline_drop">Effacer</string> @@ -581,6 +596,10 @@ <string name="cache_list_unknown">Dans aucune liste</string> <string name="cache_images">Images</string> <string name="cache_waypoints">Étapes</string> + <plurals name="waypoints"> + <item quantity="one">1 étape</item> + <item quantity="other">%d étapes</item> + </plurals> <string name="cache_waypoints_add">Ajouter une étape</string> <string name="cache_hint">Indice</string> <string name="cache_logs">Carnet de bord</string> @@ -1122,50 +1141,28 @@ <string name="tts_stop">Arrêter de parler</string> <string name="err_tts_lang_not_supported">La langue courante n\'est pas prise en charge par la synthèse vocale.</string> <string name="tts_one_kilometer">un kilomètre</string> - <string name="tts_one_meter">un mètre</string> - <string name="tts_one_mile">un mille</string> - <string name="tts_one_foot">un pied</string> - <string name="tts_one_oclock">une heure</string> - <string name="tts_oclock">%s heures</string> - <string name="clipboard_copy_ok">Copié dans le presse-papiers</string> - <string name="percent_favorite_points">%\ favoris</string> - <string name="cgeo_shortcut">c:geo raccourci</string> - <string name="create_shortcut">Créer un raccourci</string> - <string-array name="log_image_scales"> - <item>Taille originale</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minute</item> - <item quantity="other">minutes</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">une cache</item> - <item quantity="other">%1$d caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 étape</item> - <item quantity="other">%d étapes</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilomètre</item> <item quantity="other">%s kilomètres</item> </plurals> + <string name="tts_one_meter">un mètre</string> <plurals name="tts_meters"> <item quantity="one">%s mètre</item> <item quantity="other">%s mètres</item> </plurals> + <string name="tts_one_mile">un mille</string> <plurals name="tts_miles"> <item quantity="one">%s mille</item> <item quantity="other">%s milles</item> </plurals> + <string name="tts_one_foot">un pied</string> <plurals name="tts_feet"> <item quantity="one">%s pied</item> <item quantity="other">%s pieds</item> </plurals> + <string name="tts_one_oclock">une heure</string> + <string name="tts_oclock">%s heures</string> + <string name="clipboard_copy_ok">Copié dans le presse-papiers</string> <plurals name="days_ago"> <item quantity="one">hier</item> <item quantity="other">il y a %d jours</item> @@ -1174,4 +1171,7 @@ <item quantity="one">%s favori</item> <item quantity="other">%s favoris</item> </plurals> + <string name="percent_favorite_points">%\ favoris</string> + <string name="cgeo_shortcut">c:geo raccourci</string> + <string name="create_shortcut">Créer un raccourci</string> </resources> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 56d7c10..4e26fd8 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Log Password:</string> <string name="log_hint_log_password">Inserisci la password per il log</string> <string name="log_oc_team_comment">Commenti del Team OC</string> + <string-array name="log_image_scales"> + <item>Dimensioni originali</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduci in %s</string> <string name="translate_to_english">Traduci in inglese</string> <string name="translate_length_warning">La traduzione può fallire quando c\'è molto testo.</string> @@ -241,6 +248,10 @@ <string name="caches_more_caches_currently">attualmente</string> <string name="caches_downloading">Download cache in corso…\nETA: </string> <string name="caches_eta_ltm">Meno di un minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minuti</item> + </plurals> <string name="caches_store_offline">Salva per Offline</string> <string name="caches_store_selected">Salva selezionati</string> <string name="caches_history">Cronologia</string> @@ -534,6 +545,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo è ora autorizzato ad accedere a %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Un cache</item> + <item quantity="other">%1$d cache</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Aggiorna</string> <string name="cache_offline_drop">Elimina</string> @@ -578,6 +593,10 @@ <string name="cache_list_unknown">Non in una lista</string> <string name="cache_images">Immagini</string> <string name="cache_waypoints">Waypoints</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoint</item> + </plurals> <string name="cache_waypoints_add">Aggiungi waypoint</string> <string name="cache_hint">Aiuto (spoiler)</string> <string name="cache_logs">Logbook</string> @@ -1119,50 +1138,28 @@ <string name="tts_stop">Stop voce</string> <string name="err_tts_lang_not_supported">Il linguaggio attivo non è supportato dal modulo di sintesi vocale.</string> <string name="tts_one_kilometer">un chilometro</string> - <string name="tts_one_meter">un metro</string> - <string name="tts_one_mile">un miglio</string> - <string name="tts_one_foot">un piede</string> - <string name="tts_one_oclock">a ore una</string> - <string name="tts_oclock">a ore %s</string> - <string name="clipboard_copy_ok">Copiato nella clipboard</string> - <string name="percent_favorite_points">%\ preferiti</string> - <string name="cgeo_shortcut">collegamento a c:geo</string> - <string name="create_shortcut">Crea collegamento</string> - <string-array name="log_image_scales"> - <item>Dimensioni originali</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minuti</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un cache</item> - <item quantity="other">%1$d cache</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoint</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">un chilometro</item> <item quantity="other">%s chilometri</item> </plurals> + <string name="tts_one_meter">un metro</string> <plurals name="tts_meters"> <item quantity="one">un metro</item> <item quantity="other">%s metri</item> </plurals> + <string name="tts_one_mile">un miglio</string> <plurals name="tts_miles"> <item quantity="one">un miglio</item> <item quantity="other">%s miglia</item> </plurals> + <string name="tts_one_foot">un piede</string> <plurals name="tts_feet"> <item quantity="one">un piede</item> <item quantity="other">%s piedi</item> </plurals> + <string name="tts_one_oclock">a ore una</string> + <string name="tts_oclock">a ore %s</string> + <string name="clipboard_copy_ok">Copiato nella clipboard</string> <plurals name="days_ago"> <item quantity="one">ieri</item> <item quantity="other">%d giorni fa</item> @@ -1171,4 +1168,7 @@ <item quantity="one">%s preferito</item> <item quantity="other">%s preferiti</item> </plurals> + <string name="percent_favorite_points">%\ preferiti</string> + <string name="cgeo_shortcut">collegamento a c:geo</string> + <string name="create_shortcut">Crea collegamento</string> </resources> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 2212fa4..f95e56b 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -118,6 +118,13 @@ <string name="log_image_scale">拡大縮小</string> <string name="log_password_title">Log Password:</string> <string name="log_hint_log_password">Enter your log password</string> + <string-array name="log_image_scales"> + <item>実サイズ</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">%sに翻訳</string> <string name="translate_to_english">英語に翻訳</string> <string name="translate_length_warning">文章が長すぎるので翻訳できないかもしれません。</string> @@ -235,6 +242,9 @@ <string name="caches_more_caches_currently">現在</string> <string name="caches_downloading">キャッシュ情報をダウンロード中…\n残り時間: </string> <string name="caches_eta_ltm">1分以内</string> + <plurals name="caches_eta_mins"> + <item quantity="other">分</item> + </plurals> <string name="caches_store_offline">オフライン用に保存</string> <string name="caches_store_selected">選択したキャッシュを保存</string> <string name="caches_history">履歴</string> @@ -489,6 +499,9 @@ <string name="auth_dialog_completed_twitter">c:geoはTwitterにポストするための認証を受けました。</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geoは%sと連携するための認証を受けました。</string> + <plurals name="cache_counts"> + <item quantity="other">%1$d キャッシュ</item> + </plurals> <string name="cache_offline">オフライン</string> <string name="cache_offline_refresh">更新</string> <string name="cache_offline_drop">削除</string> @@ -533,6 +546,9 @@ <string name="cache_list_unknown">Not in a list</string> <string name="cache_images">画像</string> <string name="cache_waypoints">ウェイポイント</string> + <plurals name="waypoints"> + <item quantity="other">%d ウェイポイント</item> + </plurals> <string name="cache_waypoints_add">ウェイポイントを追加</string> <string name="cache_hint">ヒント</string> <string name="cache_logs">ログブック</string> @@ -1033,29 +1049,13 @@ Google翻訳アプリで各言語の辞書をダウンロードしておけば <string name="tts_start">音声案内開始</string> <string name="tts_stop">音声案内終了</string> <string name="tts_one_kilometer">1 km</string> + <plurals name="tts_kilometers"> + <item quantity="other">%s キロメートル</item> + </plurals> <string name="tts_one_meter">1 m</string> <string name="tts_one_mile">1 マイル</string> <string name="tts_one_foot">1 フィート</string> <string name="tts_one_oclock">1 時</string> <string name="tts_oclock">%s 時</string> <string name="clipboard_copy_ok">クリップボードにコピーしました</string> - <string-array name="log_image_scales"> - <item>実サイズ</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="other">分</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="other">%1$d キャッシュ</item> - </plurals> - <plurals name="waypoints"> - <item quantity="other">%d ウェイポイント</item> - </plurals> - <plurals name="tts_kilometers"> - <item quantity="other">%s キロメートル</item> - </plurals> </resources> diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml index c2b599f..9928237 100644 --- a/main/res/values-lt/strings.xml +++ b/main/res/values-lt/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Įrašo slaptažodis:</string> <string name="log_hint_log_password">Įveskite savo įrašo slaptažodį</string> <string name="log_oc_team_comment">OC komandos komentaras</string> + <string-array name="log_image_scales"> + <item>Nekeisti dydžio</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Išversti į %s</string> <string name="translate_to_english">Išversti į anglų</string> <string name="translate_length_warning">Vertimas gali nepavykti jei tekstas labai ilgas.</string> @@ -242,6 +249,11 @@ <string name="caches_more_caches_currently">dabar</string> <string name="caches_downloading">Atnaujinamos slėptuvės…\nUžtruks</string> <string name="caches_eta_ltm">mažiau nei minutę</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minutę</item> + <item quantity="few">minutes</item> + <item quantity="other">minučių</item> + </plurals> <string name="caches_store_offline">Išsaugoti slėptuves</string> <string name="caches_store_selected">Išsaugoti pasirinktas</string> <string name="caches_history">Istorija</string> @@ -490,6 +502,9 @@ <string name="init_maintenance">Priežiūra</string> <string name="init_maintenance_directories_note">c:geo saugo nuotraukas, įrašų nuotraukas ir kitus failus, susijusius su slėptuve, atskirame kataloge. Kai kuriais atvejais (pvz., importuojant/eksportuojant duomenų bazę) šiame kataloge gali likti pasenusių failų, kuriuos galima panaikinti čia.</string> <string name="init_maintenance_directories">Ištrinti nebereikalingus failus</string> + <string name="init_create_memory_dump">Sukurti atminties dump failą</string> + <string name="init_memory_dump">Atminties dump failas</string> + <string name="init_memory_dumped">Atminties dump failas išsaugotas %s</string> <string name="settings_open_website">Atidaryti interneto svetainę</string> <string name="settings_settings">Nustatymai</string> <string name="settings_information">Informacija</string> @@ -536,6 +551,11 @@ <string name="auth_dialog_completed_twitter">c:geo priregistruota ir jai leidžiama rašyti Twitter paskyroje.</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geo dabar registruota ir leidžiama naudotis %s.</string> + <plurals name="cache_counts"> + <item quantity="one">%1$d slėptuvė</item> + <item quantity="few">%1$d slėptuvės</item> + <item quantity="other">%1$d slėptuvių</item> + </plurals> <string name="cache_offline">Išsaugota</string> <string name="cache_offline_refresh">Naujinti</string> <string name="cache_offline_drop">Išmesti</string> @@ -580,6 +600,11 @@ <string name="cache_list_unknown">Nėra sąraše</string> <string name="cache_images">Nuotraukos</string> <string name="cache_waypoints">Papildomi taškai</string> + <plurals name="waypoints"> + <item quantity="one">1papildomas taškas</item> + <item quantity="few">%d papildomi taškai</item> + <item quantity="other">%d papildomų taškų</item> + </plurals> <string name="cache_waypoints_add">Pridėti papildomą tašką</string> <string name="cache_hint">Užuomina</string> <string name="cache_logs">Įrašai</string> @@ -636,7 +661,7 @@ <string name="cache_menu_pebble">Pebble</string> <string name="cache_menu_mapswithme">MapsWithMe</string> <string name="cache_status">Būsena</string> - <string name="cache_status_offline_log">Įrašas išsaugotas</string> + <string name="cache_status_offline_log">Išsaugotas įrašas</string> <string name="cache_status_found">Rasta</string> <string name="cache_not_status_found">Nerasta</string> <string name="cache_status_archived">Suarchyvuota</string> @@ -1121,57 +1146,32 @@ <string name="tts_stop">Nekalbėti</string> <string name="err_tts_lang_not_supported">Dabartinė kalba nepalaikoma teksto-į-kalbą.</string> <string name="tts_one_kilometer">vienas kilometras</string> - <string name="tts_one_meter">vienas metras</string> - <string name="tts_one_mile">viena mylia</string> - <string name="tts_one_foot">viena pėda</string> - <string name="tts_one_oclock">one o\'clock</string> - <string name="tts_oclock">%s o\'clock</string> - <string name="clipboard_copy_ok">Nukopijuota į mainų sritį</string> - <string name="percent_favorite_points">%\ mėgiamos</string> - <string name="cgeo_shortcut">c:geo nuoroda</string> - <string name="create_shortcut">Sukurti nuorodą</string> - <string-array name="log_image_scales"> - <item>Nekeisti dydžio</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minutę</item> - <item quantity="few">minutes</item> - <item quantity="other">minučių</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">%1$d slėptuvė</item> - <item quantity="few">%1$d slėptuvės</item> - <item quantity="other">%1$d slėptuvių</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1papildomas taškas</item> - <item quantity="few">%d papildomi taškai</item> - <item quantity="other">%d papildomų taškų</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometras</item> <item quantity="few">%s kilometrai</item> <item quantity="other">%s kilometrų</item> </plurals> + <string name="tts_one_meter">vienas metras</string> <plurals name="tts_meters"> <item quantity="one">%s metras</item> <item quantity="few">%s metrai</item> <item quantity="other">%s metrų</item> </plurals> + <string name="tts_one_mile">viena mylia</string> <plurals name="tts_miles"> <item quantity="one">%s mylia</item> <item quantity="few">%s mylios</item> <item quantity="other">%s mylių</item> </plurals> + <string name="tts_one_foot">viena pėda</string> <plurals name="tts_feet"> <item quantity="one">%s pėda</item> <item quantity="few">%s pėdos</item> <item quantity="other">%s pėdų</item> </plurals> + <string name="tts_one_oclock">one o\'clock</string> + <string name="tts_oclock">%s o\'clock</string> + <string name="clipboard_copy_ok">Nukopijuota į mainų sritį</string> <plurals name="days_ago"> <item quantity="one">vakar</item> <item quantity="few">%d dienas atgal</item> @@ -1182,4 +1182,7 @@ <item quantity="few">%s mėgiamos</item> <item quantity="other">%s mėgiamų</item> </plurals> + <string name="percent_favorite_points">%\ mėgiamos</string> + <string name="cgeo_shortcut">c:geo nuoroda</string> + <string name="create_shortcut">Sukurti nuorodą</string> </resources> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 124c81b..0093c4c 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Passord for logg:</string> <string name="log_hint_log_password">Angi passordet for logg</string> <string name="log_oc_team_comment">Kommentar fra OC-teamet</string> + <string-array name="log_image_scales"> + <item>Ingen skalering</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Oversett til %s</string> <string name="translate_to_english">Oversett til engelsk</string> <string name="translate_length_warning">Oversettelse kan mislykkes med store mengder tekst.</string> @@ -241,6 +248,10 @@ <string name="caches_more_caches_currently">for øyeblikket</string> <string name="caches_downloading">Laster ned cacher…\nETA: </string> <string name="caches_eta_ltm">Mindre enn ett minutt</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minutt</item> + <item quantity="other">minutter</item> + </plurals> <string name="caches_store_offline">Lagre for offline-bruk</string> <string name="caches_store_selected">Lagre valgte</string> <string name="caches_history">Historikk</string> @@ -529,6 +540,10 @@ <string name="auth_dialog_completed_twitter">c:geo har nå fått godkjenning til å kvitre på Twitter.</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geo har nå fått godkjenning til å kommunisere med %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Én cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Oppdater</string> <string name="cache_offline_drop">Fjern</string> @@ -573,6 +588,10 @@ <string name="cache_list_unknown">Ikke i en liste</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Veipunkter</string> + <plurals name="waypoints"> + <item quantity="one">1 veipunkt</item> + <item quantity="other">%d veipunkter</item> + </plurals> <string name="cache_waypoints_add">Legg til veipunkter</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Loggbok</string> @@ -1114,40 +1133,18 @@ <string name="tts_one_kilometer">en kilometer</string> <string name="tts_one_meter">en meter</string> <string name="tts_one_mile">En enkelsk mil</string> - <string name="tts_one_foot">En fot</string> - <string name="tts_one_oclock">klokken ett</string> - <string name="tts_oclock">klokken %s</string> - <string name="clipboard_copy_ok">Kopiert til utklippstavlen</string> - <string name="percent_favorite_points">%\ favoritter</string> - <string name="cgeo_shortcut">c:geo-snartvei</string> - <string name="create_shortcut">Opprett snarvei</string> - <string-array name="log_image_scales"> - <item>Ingen skalering</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minutt</item> - <item quantity="other">minutter</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Én cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 veipunkt</item> - <item quantity="other">%d veipunkter</item> - </plurals> <plurals name="tts_miles"> <item quantity="one">%s engelsk mil</item> <item quantity="other">%s engelske mil</item> </plurals> + <string name="tts_one_foot">En fot</string> <plurals name="tts_feet"> <item quantity="one">%s fot</item> <item quantity="other">%s fot</item> </plurals> + <string name="tts_one_oclock">klokken ett</string> + <string name="tts_oclock">klokken %s</string> + <string name="clipboard_copy_ok">Kopiert til utklippstavlen</string> <plurals name="days_ago"> <item quantity="one">i går</item> <item quantity="other">%d dager siden</item> @@ -1156,4 +1153,7 @@ <item quantity="one">%s favoritt</item> <item quantity="other">%s favoritt</item> </plurals> + <string name="percent_favorite_points">%\ favoritter</string> + <string name="cgeo_shortcut">c:geo-snartvei</string> + <string name="create_shortcut">Opprett snarvei</string> </resources> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index b031d8d..4dc01c9 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Log wachtwoord:</string> <string name="log_hint_log_password">Voer Login Wachtwoord</string> <string name="log_oc_team_comment">OC Team commentaar</string> + <string-array name="log_image_scales"> + <item>Niet schalen</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Vertaal naar %s</string> <string name="translate_to_english">Vertaal naar engels</string> <string name="translate_length_warning">Vertaling kan mislukken bij grote stukken tekst.</string> @@ -242,6 +249,10 @@ <string name="caches_more_caches_currently">op dit moment</string> <string name="caches_downloading">Caches aan het downloaden…\nGeschatte tijd: </string> <string name="caches_eta_ltm">Minder dan een minuut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuut</item> + <item quantity="other">minuten</item> + </plurals> <string name="caches_store_offline">Opslaan voor Offline gebruik</string> <string name="caches_store_selected">Geselecteerden opslaan</string> <string name="caches_history">Geschiedenis</string> @@ -544,6 +555,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">c:geo is nu gekoppeld met %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Een cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Verversen</string> <string name="cache_offline_drop">Laten vervallen</string> @@ -588,6 +603,10 @@ <string name="cache_list_unknown">Niet in een lijst</string> <string name="cache_images">Afbeeldingen</string> <string name="cache_waypoints">Waypoints</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoints</item> + </plurals> <string name="cache_waypoints_add">Waypoint toevoegen</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Logboek</string> @@ -1132,50 +1151,28 @@ <string name="tts_stop">Stop met praten</string> <string name="err_tts_lang_not_supported">De huidige taal wordt niet ondersteund door tekst naar spraak.</string> <string name="tts_one_kilometer">één kilometer</string> - <string name="tts_one_meter">één meter</string> - <string name="tts_one_mile">één mijl</string> - <string name="tts_one_foot">één voet</string> - <string name="tts_one_oclock">één uur</string> - <string name="tts_oclock">%s uur</string> - <string name="clipboard_copy_ok">Gekopieerd naar klembord</string> - <string name="percent_favorite_points">%\ favorieten</string> - <string name="cgeo_shortcut">c:geo snelkoppeling</string> - <string name="create_shortcut">Maak snelkoppeling</string> - <string-array name="log_image_scales"> - <item>Niet schalen</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuut</item> - <item quantity="other">minuten</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Een cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoints</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="other">%s kilometer</item> </plurals> + <string name="tts_one_meter">één meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="other">%s meter</item> </plurals> + <string name="tts_one_mile">één mijl</string> <plurals name="tts_miles"> <item quantity="one">%s mijl</item> <item quantity="other">%s mijl</item> </plurals> + <string name="tts_one_foot">één voet</string> <plurals name="tts_feet"> <item quantity="one">%s voet</item> <item quantity="other">%s voeten</item> </plurals> + <string name="tts_one_oclock">één uur</string> + <string name="tts_oclock">%s uur</string> + <string name="clipboard_copy_ok">Gekopieerd naar klembord</string> <plurals name="days_ago"> <item quantity="one">Gisteren</item> <item quantity="other">%d dagen geleden</item> @@ -1184,4 +1181,7 @@ <item quantity="one">%s favoriet</item> <item quantity="other">%s favorieten</item> </plurals> + <string name="percent_favorite_points">%\ favorieten</string> + <string name="cgeo_shortcut">c:geo snelkoppeling</string> + <string name="create_shortcut">Maak snelkoppeling</string> </resources> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index ae3493c..8a78bb3 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Hasło do logu:</string> <string name="log_hint_log_password">Wpisz hasło do logu</string> <string name="log_oc_team_comment">Komentarz zespołu OC</string> + <string-array name="log_image_scales"> + <item>Brak skalowania</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Przetłumacz na %s</string> <string name="translate_to_english">Przetłumacz na angielski</string> <string name="translate_length_warning">Tłumaczenie może nie udać się przy dużej ilości tekstu.</string> @@ -242,6 +249,11 @@ <string name="caches_more_caches_currently">Obecnie</string> <string name="caches_downloading">Pobieram skrzynki…\nSzacowany czas: </string> <string name="caches_eta_ltm">Mniej niż minuta</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="few">minuty</item> + <item quantity="other">minut</item> + </plurals> <string name="caches_store_offline">Zapisz offline</string> <string name="caches_store_selected">Zapisz wybrane</string> <string name="caches_history">Historia</string> @@ -537,6 +549,11 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo został zautoryzowany by komunikować się z %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Jedna skrzynka</item> + <item quantity="few">%1$d skrzynki</item> + <item quantity="other">%1$d skrzynek</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Odśwież</string> <string name="cache_offline_drop">Usuń</string> @@ -581,6 +598,11 @@ <string name="cache_list_unknown">Nie znajduje się na liście</string> <string name="cache_images">Zdjęcia</string> <string name="cache_waypoints">Punkty nawigacji</string> + <plurals name="waypoints"> + <item quantity="one">1 punkt</item> + <item quantity="few">%d punkty</item> + <item quantity="other">%d punktów nawigacji</item> + </plurals> <string name="cache_waypoints_add">Dodaj punkt nawigacji</string> <string name="cache_hint">Wskazówka</string> <string name="cache_logs">Dziennik</string> @@ -1124,57 +1146,32 @@ <string name="tts_stop">Przestań mówić</string> <string name="err_tts_lang_not_supported">Aktualny język nie jest wspierany przez text-to-speech.</string> <string name="tts_one_kilometer">jeden kilometr</string> - <string name="tts_one_meter">jeden metr</string> - <string name="tts_one_mile">jedna mila</string> - <string name="tts_one_foot">jedna stopa</string> - <string name="tts_one_oclock">pierwsza</string> - <string name="tts_oclock">%s</string> - <string name="clipboard_copy_ok">Skopiowano do schowka</string> - <string name="percent_favorite_points">%\ ulubionych</string> - <string name="cgeo_shortcut">skrót do c:geo</string> - <string name="create_shortcut">Utwórz skrót</string> - <string-array name="log_image_scales"> - <item>Brak skalowania</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="few">minuty</item> - <item quantity="other">minut</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Jedna skrzynka</item> - <item quantity="few">%1$d skrzynki</item> - <item quantity="other">%1$d skrzynek</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 punkt</item> - <item quantity="few">%d punkty</item> - <item quantity="other">%d punktów nawigacji</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometr</item> <item quantity="few">%s kilometry</item> <item quantity="other">%s kilometrów</item> </plurals> + <string name="tts_one_meter">jeden metr</string> <plurals name="tts_meters"> <item quantity="one">%s metr</item> <item quantity="few">%s metry</item> <item quantity="other">%s metrów</item> </plurals> + <string name="tts_one_mile">jedna mila</string> <plurals name="tts_miles"> <item quantity="one">%s mila</item> <item quantity="few">%s mile</item> <item quantity="other">%s mil</item> </plurals> + <string name="tts_one_foot">jedna stopa</string> <plurals name="tts_feet"> <item quantity="one">%s stopa</item> <item quantity="few">%s stopy</item> <item quantity="other">%s stóp</item> </plurals> + <string name="tts_one_oclock">pierwsza</string> + <string name="tts_oclock">%s</string> + <string name="clipboard_copy_ok">Skopiowano do schowka</string> <plurals name="days_ago"> <item quantity="one">wczoraj</item> <item quantity="few">%d dni temu</item> @@ -1185,4 +1182,7 @@ <item quantity="few">%s ulubione</item> <item quantity="other">%s ulubionych</item> </plurals> + <string name="percent_favorite_points">%\ ulubionych</string> + <string name="cgeo_shortcut">skrót do c:geo</string> + <string name="create_shortcut">Utwórz skrót</string> </resources> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index ec71239..203217c 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Password do registo:</string> <string name="log_hint_log_password">Inserira a password do registo</string> <string name="log_oc_team_comment">Comentário da OC Team</string> + <string-array name="log_image_scales"> + <item>Não dimensionar</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduzir para %s</string> <string name="translate_to_english">Traduzir para inglês</string> <string name="translate_length_warning">A tradução pode falhar se o texto fôr muito grande.</string> @@ -241,6 +248,10 @@ <string name="caches_more_caches_currently">actualmente</string> <string name="caches_downloading">Downloading caches…\nETE: </string> <string name="caches_eta_ltm">Menos de um minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minutos</item> + </plurals> <string name="caches_store_offline">Arquivar para uso offline</string> <string name="caches_store_selected">Arquivar selecionadas</string> <string name="caches_history">Histórico</string> @@ -537,6 +548,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">Opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo está agora autorizado a interagir com %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Uma cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Arquivo</string> <string name="cache_offline_refresh">Actualizar</string> <string name="cache_offline_drop">Apagar</string> @@ -581,6 +596,10 @@ <string name="cache_list_unknown">Não está numa lista</string> <string name="cache_images">Imagens</string> <string name="cache_waypoints">Pontos de referência</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoints</item> + </plurals> <string name="cache_waypoints_add">Adicionar ponto de referência</string> <string name="cache_hint">Pista</string> <string name="cache_logs">Logbook</string> @@ -1122,52 +1141,33 @@ <string name="tts_stop">Páre de falar</string> <string name="err_tts_lang_not_supported">A linguagem corrente não é suportada pelo texto em fala.</string> <string name="tts_one_kilometer">um quilômetro</string> - <string name="tts_one_meter">um metro</string> - <string name="tts_one_mile">uma milha</string> - <string name="tts_one_foot">um pé</string> - <string name="tts_one_oclock">uma hora</string> - <string name="tts_oclock">%s horas</string> - <string name="clipboard_copy_ok">Copiado para a área de transferência</string> - <string name="percent_favorite_points">%\ favoritos</string> - <string name="cgeo_shortcut">Atalho c:geo</string> - <string name="create_shortcut">Criar atalho</string> - <string-array name="log_image_scales"> - <item>Não dimensionar</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minutos</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Uma cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoints</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s quilômetros</item> <item quantity="other">%s quilômetros</item> </plurals> + <string name="tts_one_meter">um metro</string> <plurals name="tts_meters"> <item quantity="one">%s metro</item> <item quantity="other">%s metros</item> </plurals> + <string name="tts_one_mile">uma milha</string> <plurals name="tts_miles"> <item quantity="one">%s milha</item> <item quantity="other">%s milhas</item> </plurals> + <string name="tts_one_foot">um pé</string> <plurals name="tts_feet"> <item quantity="one">%s pé</item> <item quantity="other">%s pés</item> </plurals> + <string name="tts_one_oclock">uma hora</string> + <string name="tts_oclock">%s horas</string> + <string name="clipboard_copy_ok">Copiado para a área de transferência</string> <plurals name="days_ago"> <item quantity="one">ontem</item> <item quantity="other">%d dias atrás</item> </plurals> + <string name="percent_favorite_points">%\ favoritos</string> + <string name="cgeo_shortcut">Atalho c:geo</string> + <string name="create_shortcut">Criar atalho</string> </resources> diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml index 71659a6..47c87ad 100644 --- a/main/res/values-ro/strings.xml +++ b/main/res/values-ro/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Parolă:</string> <string name="log_hint_log_password">Introdu parola pentru jurnal</string> <string name="log_oc_team_comment">Comentariu din partea echipei OC</string> + <string-array name="log_image_scales"> + <item>Fără redimensionare</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Tradu în limba %s</string> <string name="translate_to_english">Tradu în limba engleză</string> <string name="translate_length_warning">Traducerea poate fi incompletă în cazul unui text mare.</string> @@ -1136,11 +1143,4 @@ <string name="percent_favorite_points">%\ favorite</string> <string name="cgeo_shortcut">legătură la c:geo</string> <string name="create_shortcut">Crează scurtătură</string> - <string-array name="log_image_scales"> - <item>Fără redimensionare</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> </resources> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 771ee74..9cf8b70 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Prihlásiť heslo:</string> <string name="log_hint_log_password">Zadajte svoje logovacie heslo</string> <string name="log_oc_team_comment">Komentár tímu OC</string> + <string-array name="log_image_scales"> + <item>Bez zmeny mierky</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Preložiť do jazyka %s</string> <string name="translate_to_english">Preložiť do angličtiny</string> <string name="translate_length_warning">Pre veľké texty môže preklad zlyhať.</string> @@ -581,6 +588,11 @@ <string name="cache_list_unknown">Nie je v zozname</string> <string name="cache_images">Obrázky</string> <string name="cache_waypoints">Body trasy</string> + <plurals name="waypoints"> + <item quantity="one">1 bod trasy</item> + <item quantity="few">%d body trasy</item> + <item quantity="other">%d bodov trasy</item> + </plurals> <string name="cache_waypoints_add">Pridať bod</string> <string name="cache_hint">Nápoveda</string> <string name="cache_logs">Logbook</string> @@ -1122,47 +1134,32 @@ <string name="tts_stop">Prestať hovoriť</string> <string name="err_tts_lang_not_supported">Aktuálny jazyk nepodporuje prevod textu na reč.</string> <string name="tts_one_kilometer">jeden kilometer</string> - <string name="tts_one_meter">jeden meter</string> - <string name="tts_one_mile">jedna míľa</string> - <string name="tts_one_foot">jedna stopa</string> - <string name="tts_one_oclock">jedna hodina</string> - <string name="tts_oclock">%s hodín</string> - <string name="clipboard_copy_ok">Skopírované do schránky</string> - <string name="percent_favorite_points">% \ obľúbených</string> - <string name="cgeo_shortcut">c:Geo odkaz</string> - <string name="create_shortcut">Vytvoriť odkaz</string> - <string-array name="log_image_scales"> - <item>Bez zmeny mierky</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="waypoints"> - <item quantity="one">1 bod trasy</item> - <item quantity="few">%d body trasy</item> - <item quantity="other">%d bodov trasy</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="few">%s kilometre</item> <item quantity="other">%s kilometrov</item> </plurals> + <string name="tts_one_meter">jeden meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="few">%s metre</item> <item quantity="other">%s metrov</item> </plurals> + <string name="tts_one_mile">jedna míľa</string> <plurals name="tts_miles"> <item quantity="one">%s míľa</item> <item quantity="few">%s míľ</item> <item quantity="other">%s míľ</item> </plurals> + <string name="tts_one_foot">jedna stopa</string> <plurals name="tts_feet"> <item quantity="one">%s stopa</item> <item quantity="few">%s stopy</item> <item quantity="other">%s stôp</item> </plurals> + <string name="tts_one_oclock">jedna hodina</string> + <string name="tts_oclock">%s hodín</string> + <string name="clipboard_copy_ok">Skopírované do schránky</string> <plurals name="days_ago"> <item quantity="one">včera</item> <item quantity="few">pred %d dňami</item> @@ -1173,4 +1170,7 @@ <item quantity="few">%s obľúbené</item> <item quantity="other">%s obľúbených</item> </plurals> + <string name="percent_favorite_points">% \ obľúbených</string> + <string name="cgeo_shortcut">c:Geo odkaz</string> + <string name="create_shortcut">Vytvoriť odkaz</string> </resources> diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml index 74a7d75..898b900 100644 --- a/main/res/values-sl/strings.xml +++ b/main/res/values-sl/strings.xml @@ -121,6 +121,13 @@ <string name="log_password_title">Geslo zapisa:</string> <string name="log_hint_log_password">Vnesite geslo zapisa</string> <string name="log_oc_team_comment">Komentar ekipe OC</string> + <string-array name="log_image_scales"> + <item>Brez skaliranja</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Prevedi v: %s</string> <string name="translate_to_english">Prevedi v: angleščino</string> <string name="translate_length_warning">Prevod lahko spodleti zaradi velike količine besedila.</string> @@ -241,6 +248,12 @@ <string name="caches_more_caches_currently">trenutno</string> <string name="caches_downloading">Nalagam zaklade…\nČas do konca: </string> <string name="caches_eta_ltm">manj kot minuta</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="two">minuti</item> + <item quantity="few">minute</item> + <item quantity="other">minut</item> + </plurals> <string name="caches_store_offline">Shrani</string> <string name="caches_store_selected">Shrani izbrane</string> <string name="caches_history">Zgodovina</string> @@ -534,6 +547,12 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo je sedaj povezan z %s.</string> + <plurals name="cache_counts"> + <item quantity="one">%1$d zaklad</item> + <item quantity="two">%1$d zaklada</item> + <item quantity="few">%1$d zakladi</item> + <item quantity="other">%1$d zakladov</item> + </plurals> <string name="cache_offline">Brez povezave</string> <string name="cache_offline_refresh">Osveži</string> <string name="cache_offline_drop">Izbriši</string> @@ -578,6 +597,12 @@ <string name="cache_list_unknown">Ni v seznamu</string> <string name="cache_images">Slike</string> <string name="cache_waypoints">Dodatne točke</string> + <plurals name="waypoints"> + <item quantity="one">%d dodatna točka</item> + <item quantity="two">%d dodatni točki</item> + <item quantity="few">%d dodatne točke</item> + <item quantity="other">%d dodatnih točk</item> + </plurals> <string name="cache_waypoints_add">Dodaj točko</string> <string name="cache_hint">Namig</string> <string name="cache_logs">Dnevnik zapisov</string> @@ -1119,64 +1144,36 @@ <string name="tts_stop">Ustavi glasovno navigacijo</string> <string name="err_tts_lang_not_supported">Trenutno izbrani jezik ni podprt s storitvijo pretvorbe besedila v govor.</string> <string name="tts_one_kilometer">en kilometer</string> - <string name="tts_one_meter">en meter</string> - <string name="tts_one_mile">ena milja</string> - <string name="tts_one_foot">en čevelj</string> - <string name="tts_one_oclock">one o\'clock</string> - <string name="tts_oclock">%s o\'clock</string> - <string name="clipboard_copy_ok">Skopirano v odložišče</string> - <string name="percent_favorite_points">%\ favoritov</string> - <string name="cgeo_shortcut">Bližnjica c:geo</string> - <string name="create_shortcut">Ustvari bližnjico</string> - <string-array name="log_image_scales"> - <item>Brez skaliranja</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="two">minuti</item> - <item quantity="few">minute</item> - <item quantity="other">minut</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">%1$d zaklad</item> - <item quantity="two">%1$d zaklada</item> - <item quantity="few">%1$d zakladi</item> - <item quantity="other">%1$d zakladov</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">%d dodatna točka</item> - <item quantity="two">%d dodatni točki</item> - <item quantity="few">%d dodatne točke</item> - <item quantity="other">%d dodatnih točk</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="two">%s kilometra</item> <item quantity="few">%s kilometrov</item> <item quantity="other">%s kilometrov</item> </plurals> + <string name="tts_one_meter">en meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="two">%s metra</item> <item quantity="few">%s metri</item> <item quantity="other">%s metrov</item> </plurals> + <string name="tts_one_mile">ena milja</string> <plurals name="tts_miles"> <item quantity="one">%s milja</item> <item quantity="two">%s milji</item> <item quantity="few">%s milj</item> <item quantity="other">%s milj</item> </plurals> + <string name="tts_one_foot">en čevelj</string> <plurals name="tts_feet"> <item quantity="one">%s čevelj</item> <item quantity="two">%s čevlja</item> <item quantity="few">%s čevljev</item> <item quantity="other">%s čevljev</item> </plurals> + <string name="tts_one_oclock">one o\'clock</string> + <string name="tts_oclock">%s o\'clock</string> + <string name="clipboard_copy_ok">Skopirano v odložišče</string> <plurals name="days_ago"> <item quantity="one">Pred %d dnevom</item> <item quantity="two">Pred %d dnevoma</item> @@ -1189,4 +1186,7 @@ <item quantity="few">%s favoritov</item> <item quantity="other">%s favoritov</item> </plurals> + <string name="percent_favorite_points">%\ favoritov</string> + <string name="cgeo_shortcut">Bližnjica c:geo</string> + <string name="create_shortcut">Ustvari bližnjico</string> </resources> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 0ebaa4e..fd0f4b1 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -122,6 +122,13 @@ <string name="log_password_title">Logglösenord:</string> <string name="log_hint_log_password">Ange ditt lösenord för loggning</string> <string name="log_oc_team_comment">Meddelande från OC Team</string> + <string-array name="log_image_scales"> + <item>Ingen skalning</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Översätt till %s</string> <string name="translate_to_english">Översätt till engelska</string> <string name="translate_length_warning">Översättningen kan misslyckas med långa texter.</string> @@ -242,6 +249,10 @@ <string name="caches_more_caches_currently">nu</string> <string name="caches_downloading">Laddar ner cacher…\nTid kvar: </string> <string name="caches_eta_ltm">mindre än en minut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minut</item> + <item quantity="other">minuter</item> + </plurals> <string name="caches_store_offline">Spara för Offline</string> <string name="caches_store_selected">Spara valda</string> <string name="caches_history">Senast hittade cacher</string> @@ -544,6 +555,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">c:geo är nu godkänd för att kommunicera med %s.</string> + <plurals name="cache_counts"> + <item quantity="one">En cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Uppdatera</string> <string name="cache_offline_drop">Radera</string> @@ -588,6 +603,10 @@ <string name="cache_list_unknown">Ej i någon lista</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Punkter</string> + <plurals name="waypoints"> + <item quantity="one">1 Punkt</item> + <item quantity="other">%d Punkter</item> + </plurals> <string name="cache_waypoints_add">Lägg till punkt</string> <string name="cache_hint">Tips</string> <string name="cache_logs">Loggbok</string> @@ -1132,52 +1151,33 @@ <string name="tts_stop">Stoppa tal</string> <string name="err_tts_lang_not_supported">Detta språk hanteras inte av text-to-speech.</string> <string name="tts_one_kilometer">en kilometer</string> - <string name="tts_one_meter">en meter</string> - <string name="tts_one_mile">en engelsk mil</string> - <string name="tts_one_foot">en fot</string> - <string name="tts_one_oclock">Klockan ett</string> - <string name="tts_oclock">Klockan %s</string> - <string name="clipboard_copy_ok">Kopierat till urklipp</string> - <string name="percent_favorite_points">%\ favoriter</string> - <string name="cgeo_shortcut">c:geo genväg</string> - <string name="create_shortcut">Skapa genväg</string> - <string-array name="log_image_scales"> - <item>Ingen skalning</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minut</item> - <item quantity="other">minuter</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">En cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Punkt</item> - <item quantity="other">%d Punkter</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="other">%s kilometer</item> </plurals> + <string name="tts_one_meter">en meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="other">%s meter</item> </plurals> + <string name="tts_one_mile">en engelsk mil</string> <plurals name="tts_miles"> <item quantity="one">%s engelsk mil</item> <item quantity="other">%s engelsk mil</item> </plurals> + <string name="tts_one_foot">en fot</string> <plurals name="tts_feet"> <item quantity="one">%s fot</item> <item quantity="other">%s fot</item> </plurals> + <string name="tts_one_oclock">Klockan ett</string> + <string name="tts_oclock">Klockan %s</string> + <string name="clipboard_copy_ok">Kopierat till urklipp</string> <plurals name="days_ago"> <item quantity="one">igår</item> <item quantity="other">%d dagar sedan</item> </plurals> + <string name="percent_favorite_points">%\ favoriter</string> + <string name="cgeo_shortcut">c:geo genväg</string> + <string name="create_shortcut">Skapa genväg</string> </resources> diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml index 1083326..9b5a562 100644 --- a/main/res/values/changelog_master.xml +++ b/main/res/values/changelog_master.xml @@ -3,9 +3,11 @@ <!-- changelog for the master branch --> <string name="changelog_master" translatable="false"> <b>Next feature release:</b>\n + · New: Implemented actionbar menus\n · New: Show also own logs on friend log page\n · New: Filter for caches which are not found\n - · New: Show \"Import from web\" also if not yet registered\n + · New: Show "Import from web" also if not yet registered\n + · New: Popup list of changes on first start after upgrade\n · New: Debugging option to save memory dumps on user demand\n · Fix: Hiding own caches on opencaching\n · Fix: Webcam caches not marked as found after posting log\n diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index 906158d..f8b9230 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -171,4 +171,5 @@ <string name="pref_ec_icons">ec_icons</string> <string name="pref_memory_dump">memory_dump</string> <string name="pref_appearance">pref_appearance</string> + <string name="pref_changelog_last_version">changelog_last_version</string> </resources> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index c5bdae1..7928e80 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -33,6 +33,10 @@ <!-- Identical to cgeo aside from different parent style --> <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar"> + <!-- For some reason we get the non inversed texts here (bug in abc?), explicitly set text styles --> + <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item> + <item name="android:buttonStyle">@style/button</item> <item name="android:editTextStyle">@style/edittext</item> @@ -79,7 +83,7 @@ <style name="light" parent="cgeo_light"> <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> + <item name="android:windowBackground">@color/just_white</item> <item name="text_color">@color/text_light</item> <item name="text_color_headline">@color/text_headline_light</item> <item name="text_color_grey">@color/text_grey_light</item> @@ -107,7 +111,7 @@ </style> - <style name="Theme.AppCompat.Translucent.Light" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="cgeo.Translucent.Light" parent="light"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowIsTranslucent">true</item> @@ -115,87 +119,21 @@ </style> - <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat"> + <style name="cgeo.Translucent" parent="dark"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowAnimationStyle">@android:style/Animation</item> </style> - <style name="cgeo_popup" parent="Theme.AppCompat.Translucent.Light"> - <!-- system elements --> - <item name="android:buttonStyle">@style/button</item> - <item name="android:editTextStyle">@style/edittext</item> + <style name="cgeo_popup" parent="cgeo.Translucent.Light"> <item name="android:windowNoTitle">true</item> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> - <style name="popup_dark" parent="Theme.AppCompat.Translucent"> - <!-- system elements --> - <item name="android:buttonStyle">@style/button</item> - <item name="android:editTextStyle">@style/edittext</item> - <item name="android:windowNoTitle">true</item> - - <!-- own values: colors --> - <item name="just_color">@color/just_black</item> - <item name="text_color">@color/text_dark</item> - <item name="text_color_headline">@color/text_headline_dark</item> - <item name="text_color_grey">@color/text_grey_dark</item> - <item name="text_color_hint">@color/text_hint_dark</item> - <item name="text_color_link">@color/link</item> - <item name="button_color_enabled">@color/button_enabled</item> - <item name="button_color_disabled">@color/button_disabled</item> - <item name="background_color">@color/background_dark</item> - <item name="background_color_notice">@color/background_dark_notice</item> - <item name="background_color_transparent">@color/background_dark_transparent</item> - <item name="separator_color">@color/separator_dark</item> - - <!-- own values: drawables --> - <item name="button">@drawable/action_button_dark</item> - <item name="input">@drawable/input_bcg_dark</item> - <item name="inventory">@drawable/inventory_background_dark</item> - <item name="favorite">@drawable/favorite_background_dark</item> - <item name="favorite_r">@drawable/favorite_background_red_dark</item> - <item name="favorite_o">@drawable/favorite_background_orange_dark</item> - <item name="favorite_g">@drawable/favorite_background_green_dark</item> - <item name="close">@drawable/map_close_dark</item> - <item name="log_img_icon">@drawable/log_img_dark</item> - <item name="actionbar_compass">@drawable/actionbar_compass_dark</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item> - - <!-- own values: other --> - <item name="compass">0</item> + <style name="popup_dark" parent="cgeo.Translucent"> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> <style name="popup_light" parent="cgeo_popup"> - - <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> - <item name="text_color">@color/text_light</item> - <item name="text_color_headline">@color/text_headline_light</item> - <item name="text_color_grey">@color/text_grey_light</item> - <item name="text_color_hint">@color/text_hint_light</item> - <item name="background_color">@color/background_light</item> - <item name="background_color_notice">@color/background_light_notice</item> - <item name="background_color_transparent">@color/background_light_transparent</item> - <item name="separator_color">@color/separator_light</item> - - <!-- own values: drawables --> - <item name="button">@drawable/action_button_light</item> - <item name="input">@drawable/input_bcg_light</item> - <item name="inventory">@drawable/inventory_background_light</item> - <item name="favorite">@drawable/favorite_background_light</item> - <item name="favorite_r">@drawable/favorite_background_red_light</item> - <item name="favorite_o">@drawable/favorite_background_orange_light</item> - <item name="favorite_g">@drawable/favorite_background_green_light</item> - <item name="close">@drawable/map_close_light</item> - <item name="log_img_icon">@drawable/log_img_light</item> - <item name="actionbar_compass">@drawable/actionbar_compass_light</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large.Inverse</item> - - <!-- own values: other --> - <item name="compass">1</item> </style> <style name="settings" parent="@style/Theme.AppCompat"> diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index 6cda723..f46a5a6 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -28,6 +29,8 @@ import java.util.Scanner; public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> { + private static final String EXTRA_ABOUT_STARTPAGE = "cgeo.geocaching.extra.about.startpage"; + class LicenseViewCreator extends AbstractCachingPageViewCreator<ScrollView> { @InjectView(R.id.license) protected TextView licenseLink; @@ -142,7 +145,13 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @Override public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState, R.layout.viewpager_activity); - createViewPager(0, null); + + int startPage = Page.VERSION.ordinal(); + Bundle extras = getIntent().getExtras(); + if (extras != null) { + startPage = extras.getInt(EXTRA_ABOUT_STARTPAGE, startPage); + } + createViewPager(startPage, null); reinitializeViewPager(); } @@ -210,4 +219,10 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> return result; } + public static void showChangeLog(Context fromActivity) { + final Intent intent = new Intent(fromActivity, AboutActivity.class); + intent.putExtra(EXTRA_ABOUT_STARTPAGE, Page.CHANGELOG.ordinal()); + fromActivity.startActivity(intent); + } + } diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java index 9bc46b3..279dbd5 100644 --- a/main/src/cgeo/geocaching/EditWaypointActivity.java +++ b/main/src/cgeo/geocaching/EditWaypointActivity.java @@ -294,7 +294,7 @@ public class EditWaypointActivity extends AbstractActionBarActivity { // button text is blank when creating new waypoint } Geocache cache = DataStore.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS); - CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(EditWaypointActivity.this, cache, gp, app.currentGeo()); + CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(cache, gp, app.currentGeo()); coordsDialog.setCancelable(true); coordsDialog.setOnCoordinateUpdate(new CoordinatesInputDialog.CoordinateUpdate() { @Override @@ -303,7 +303,7 @@ public class EditWaypointActivity extends AbstractActionBarActivity { buttonLon.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE)); } }); - coordsDialog.show(); + coordsDialog.show(getSupportFragmentManager(),"wpeditdialog"); } } diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index cccd154..64fe429 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -485,9 +485,9 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia @Override public void onClick(View arg0) { - final Dialog dateDialog = new DateDialog(LogCacheActivity.this, LogCacheActivity.this, date); + final DateDialog dateDialog = DateDialog.getInstance(date); dateDialog.setCancelable(true); - dateDialog.show(); + dateDialog.show(getSupportFragmentManager(), "date_dialog"); } } diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java index fabe391..e1ca612 100644 --- a/main/src/cgeo/geocaching/LogTrackableActivity.java +++ b/main/src/cgeo/geocaching/LogTrackableActivity.java @@ -240,9 +240,9 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat @Override public void onClick(View arg0) { - final Dialog dateDialog = new DateDialog(LogTrackableActivity.this, LogTrackableActivity.this, date); + final DateDialog dateDialog = DateDialog.getInstance(date); dateDialog.setCancelable(true); - dateDialog.show(); + dateDialog.show(getSupportFragmentManager(),"date_dialog"); } } diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 473d870..8de27b0 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -213,6 +213,8 @@ public class MainActivity extends AbstractActionBarActivity { Log.i("Starting " + getPackageName() + ' ' + version + " a.k.a " + Version.getVersionName(this)); init(); + + checkShowChangelog(); } @Override @@ -726,6 +728,16 @@ public class MainActivity extends AbstractActionBarActivity { } } + private void checkShowChangelog() { + int lastVersion = Settings.getLastChangelogVersion(); + int version = Version.getVersionCode(this); + Settings.setLastChangelogVersion(version); + // don't show change log after new install... + if (lastVersion > 0 && version != lastVersion) { + AboutActivity.showChangeLog(this); + } + } + /** * @param view * unused here but needed since this method is referenced from XML layout diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java index a4053dc..f92c5df 100644 --- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java +++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java @@ -278,7 +278,7 @@ public class NavigateAnyPointActivity extends AbstractActionBarActivity { if (latButton.getText().length() > 0 && lonButton.getText().length() > 0) { gp = new Geopoint(latButton.getText().toString() + " " + lonButton.getText().toString()); } - CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(NavigateAnyPointActivity.this, null, gp, app.currentGeo()); + CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(null, gp, app.currentGeo()); coordsDialog.setCancelable(true); coordsDialog.setOnCoordinateUpdate(new CoordinatesInputDialog.CoordinateUpdate() { @Override @@ -288,7 +288,7 @@ public class NavigateAnyPointActivity extends AbstractActionBarActivity { changed = true; } }); - coordsDialog.show(); + coordsDialog.show(getSupportFragmentManager(),"wpedit_dialog"); } } diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java index f1f09d4..40d6ffe 100644 --- a/main/src/cgeo/geocaching/SearchActivity.java +++ b/main/src/cgeo/geocaching/SearchActivity.java @@ -290,7 +290,7 @@ public class SearchActivity extends AbstractActionBarActivity { } private void updateCoordinates() { - final CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(SearchActivity.this, null, null, app.currentGeo()); + final CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(null, null, app.currentGeo()); coordsDialog.setCancelable(true); coordsDialog.setOnCoordinateUpdate(new CoordinatesInputDialog.CoordinateUpdate() { @Override @@ -299,7 +299,7 @@ public class SearchActivity extends AbstractActionBarActivity { buttonLongitude.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE)); } }); - coordsDialog.show(); + coordsDialog.show(getSupportFragmentManager(),"wpedit_dialog"); } private void findByCoordsFn() { diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index 9907060..a0adb3b 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -96,9 +96,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi geocode = trackable.getGeocode(); if (StringUtils.isNotBlank(trackable.getName())) { - setTitle(Html.fromHtml(trackable.getName()).toString()); + getSupportActionBar().setTitle(Html.fromHtml(trackable.getName()).toString()); } else { - setTitle(trackable.getName()); + getSupportActionBar().setTitle(trackable.getName()); } invalidateOptionsMenuCompatible(); @@ -131,7 +131,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi super.onCreate(savedInstanceState, R.layout.viewpager_activity); // set title in code, as the activity needs a hard coded title due to the intent filters - setTitle(res.getString(R.string.trackable)); + getSupportActionBar().setTitle(res.getString(R.string.trackable)); // get parameters final Bundle extras = getIntent().getExtras(); diff --git a/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java b/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java index b35f6e3..615a432 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActionBarActivity.java @@ -20,12 +20,6 @@ public class AbstractActionBarActivity extends AbstractActivity { showProgress(false); } - @Override - protected void onCreate(Bundle savedInstanceState, int resourceLayoutID, boolean useDialogTheme) { - super.onCreate(savedInstanceState, resourceLayoutID, useDialogTheme); - initUpAction(); - showProgress(false); - } private void initUpAction() { getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java index a18f32c..d542b13 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java @@ -120,21 +120,14 @@ public abstract class AbstractActivity extends ActionBarActivity implements IAbs } protected void onCreate(final Bundle savedInstanceState, final int resourceLayoutID) { - onCreate(savedInstanceState, resourceLayoutID, false); - } - - protected void onCreate(final Bundle savedInstanceState, final int resourceLayoutID, boolean useDialogTheme) { super.onCreate(savedInstanceState); initializeCommonFields(); // non declarative part of layout - if (useDialogTheme) { - setTheme(ActivityMixin.getDialogTheme()); - } else { - setTheme(); - } + setTheme(); + setContentView(resourceLayoutID); // create view variables diff --git a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java index 527f024..ff9a165 100644 --- a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java @@ -5,6 +5,7 @@ import butterknife.InjectView; import cgeo.geocaching.Intents; import cgeo.geocaching.R; import cgeo.geocaching.activity.AbstractActionBarActivity; +import cgeo.geocaching.activity.AbstractActivity; import cgeo.geocaching.utils.BundleUtils; import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.MatcherWrapper; @@ -32,7 +33,7 @@ import android.widget.TextView; import java.io.IOException; import java.util.regex.Pattern; -public abstract class OAuthAuthorizationActivity extends AbstractActionBarActivity { +public abstract class OAuthAuthorizationActivity extends AbstractActivity { public static final int NOT_AUTHENTICATED = 0; public static final int AUTHENTICATED = 1; @@ -106,7 +107,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActionBarActivi @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState, R.layout.authorization_activity, true); + super.onCreate(savedInstanceState, R.layout.authorization_activity); Bundle extras = getIntent().getExtras(); if (extras != null) { diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index a527fc5..474558d 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -1008,4 +1008,12 @@ public class Settings { return getString(R.string.pref_ec_icons, "1"); } + /* Store last version for the changelog display */ + public static int getLastChangelogVersion() { + return getInt(R.string.pref_changelog_last_version, 0); + } + + public static void setLastChangelogVersion(int version) { + putInt(R.string.pref_changelog_last_version, version); + } } diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java index 67b8923..b4d1292 100644 --- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java @@ -14,10 +14,14 @@ import cgeo.geocaching.utils.EditUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; +import android.app.Dialog; import android.os.Bundle; +import android.support.v4.app.DialogFragment; import android.text.Editable; import android.text.TextWatcher; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; @@ -28,9 +32,8 @@ import android.widget.TextView; import java.lang.ref.WeakReference; -public class CoordinatesInputDialog extends NoTitleDialog { +public class CoordinatesInputDialog extends DialogFragment { - final private WeakReference<AbstractActivity> context; final private IGeoData geo; final private Geocache cache; private Geopoint gp; @@ -46,9 +49,8 @@ public class CoordinatesInputDialog extends NoTitleDialog { private CoordInputFormatEnum currentFormat = null; - public CoordinatesInputDialog(final @NonNull AbstractActivity context, final Geocache cache, final Geopoint gp, final IGeoData geo) { - super(context, ActivityMixin.getDialogTheme()); - this.context = new WeakReference<AbstractActivity>(context); + public CoordinatesInputDialog(final Geocache cache, final Geopoint gp, final IGeoData geo) { + this.geo = geo; this.cache = cache; @@ -62,14 +64,13 @@ public class CoordinatesInputDialog extends NoTitleDialog { } @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.coordinatesinput_dialog); + public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { + getDialog().setTitle(R.string.cache_coordinates); - final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats); + View v = inflater.inflate(R.layout.coordinatesinput_dialog, container, false); + final Spinner spinner = (Spinner) v.findViewById(R.id.spinnerCoordinateFormats); final ArrayAdapter<CharSequence> adapter = - ArrayAdapter.createFromResource(context.get(), + ArrayAdapter.createFromResource(getActivity(), R.array.waypoint_coordinate_formats, android.R.layout.simple_spinner_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); @@ -77,25 +78,25 @@ public class CoordinatesInputDialog extends NoTitleDialog { spinner.setSelection(Settings.getCoordInputFormat().ordinal()); spinner.setOnItemSelectedListener(new CoordinateFormatListener()); - bLat = (Button) findViewById(R.id.ButtonLat); - eLat = (EditText) findViewById(R.id.latitude); - eLatDeg = (EditText) findViewById(R.id.EditTextLatDeg); - eLatMin = (EditText) findViewById(R.id.EditTextLatMin); - eLatSec = (EditText) findViewById(R.id.EditTextLatSec); - eLatSub = (EditText) findViewById(R.id.EditTextLatSecFrac); - tLatSep1 = (TextView) findViewById(R.id.LatSeparator1); - tLatSep2 = (TextView) findViewById(R.id.LatSeparator2); - tLatSep3 = (TextView) findViewById(R.id.LatSeparator3); - - bLon = (Button) findViewById(R.id.ButtonLon); - eLon = (EditText) findViewById(R.id.longitude); - eLonDeg = (EditText) findViewById(R.id.EditTextLonDeg); - eLonMin = (EditText) findViewById(R.id.EditTextLonMin); - eLonSec = (EditText) findViewById(R.id.EditTextLonSec); - eLonSub = (EditText) findViewById(R.id.EditTextLonSecFrac); - tLonSep1 = (TextView) findViewById(R.id.LonSeparator1); - tLonSep2 = (TextView) findViewById(R.id.LonSeparator2); - tLonSep3 = (TextView) findViewById(R.id.LonSeparator3); + bLat = (Button) v.findViewById(R.id.ButtonLat); + eLat = (EditText) v.findViewById(R.id.latitude); + eLatDeg = (EditText) v.findViewById(R.id.EditTextLatDeg); + eLatMin = (EditText) v.findViewById(R.id.EditTextLatMin); + eLatSec = (EditText) v.findViewById(R.id.EditTextLatSec); + eLatSub = (EditText) v.findViewById(R.id.EditTextLatSecFrac); + tLatSep1 = (TextView) v.findViewById(R.id.LatSeparator1); + tLatSep2 = (TextView) v.findViewById(R.id.LatSeparator2); + tLatSep3 = (TextView) v.findViewById(R.id.LatSeparator3); + + bLon = (Button) v.findViewById(R.id.ButtonLon); + eLon = (EditText) v.findViewById(R.id.longitude); + eLonDeg = (EditText) v.findViewById(R.id.EditTextLonDeg); + eLonMin = (EditText) v.findViewById(R.id.EditTextLonMin); + eLonSec = (EditText) v.findViewById(R.id.EditTextLonSec); + eLonSub = (EditText) v.findViewById(R.id.EditTextLonSecFrac); + tLonSep1 = (TextView) v.findViewById(R.id.LonSeparator1); + tLonSep2 = (TextView) v.findViewById(R.id.LonSeparator2); + tLonSep3 = (TextView) v.findViewById(R.id.LonSeparator3); eLatDeg.addTextChangedListener(new TextChanged(eLatDeg)); eLatMin.addTextChangedListener(new TextChanged(eLatMin)); @@ -118,18 +119,22 @@ public class CoordinatesInputDialog extends NoTitleDialog { bLat.setOnClickListener(new ButtonClickListener()); bLon.setOnClickListener(new ButtonClickListener()); - final Button buttonCurrent = (Button) findViewById(R.id.current); + final Button buttonCurrent = (Button) v.findViewById(R.id.current); buttonCurrent.setOnClickListener(new CurrentListener()); - final Button buttonCache = (Button) findViewById(R.id.cache); + final Button buttonCache = (Button) v.findViewById(R.id.cache); if (cache != null) { buttonCache.setOnClickListener(new CacheListener()); } else { buttonCache.setVisibility(View.GONE); } - final Button buttonDone = (Button) findViewById(R.id.done); + final Button buttonDone = (Button) v.findViewById(R.id.done); buttonDone.setOnClickListener(new InputDoneListener()); + + return v; } + + private void updateGUI() { if (gp == null) { return; @@ -140,14 +145,14 @@ public class CoordinatesInputDialog extends NoTitleDialog { switch (currentFormat) { case Plain: - findViewById(R.id.coordTable).setVisibility(View.GONE); + getView().findViewById(R.id.coordTable).setVisibility(View.GONE); eLat.setVisibility(View.VISIBLE); eLon.setVisibility(View.VISIBLE); eLat.setText(gp.format(GeopointFormatter.Format.LAT_DECMINUTE)); eLon.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE)); break; case Deg: // DDD.DDDDD° - findViewById(R.id.coordTable).setVisibility(View.VISIBLE); + getView().findViewById(R.id.coordTable).setVisibility(View.VISIBLE); eLat.setVisibility(View.GONE); eLon.setVisibility(View.GONE); eLatSec.setVisibility(View.GONE); @@ -168,7 +173,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { eLonMin.setText(addZeros(gp.getLonDegFrac(), 5)); break; case Min: // DDD° MM.MMM - findViewById(R.id.coordTable).setVisibility(View.VISIBLE); + getView().findViewById(R.id.coordTable).setVisibility(View.VISIBLE); eLat.setVisibility(View.GONE); eLon.setVisibility(View.GONE); eLatSec.setVisibility(View.VISIBLE); @@ -193,7 +198,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { eLonSec.setText(addZeros(gp.getLonMinFrac(), 3)); break; case Sec: // DDD° MM SS.SSS - findViewById(R.id.coordTable).setVisibility(View.VISIBLE); + getView().findViewById(R.id.coordTable).setVisibility(View.VISIBLE); eLat.setVisibility(View.GONE); eLon.setVisibility(View.GONE); eLatSec.setVisibility(View.VISIBLE); @@ -374,7 +379,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { // Signaled and returned below } if (signalError) { - final AbstractActivity activity = context.get(); + final AbstractActivity activity = (AbstractActivity) getActivity(); activity.showToast(activity.getResources().getString(R.string.err_parse_lat_lon)); } return false; @@ -427,7 +432,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { @Override public void onClick(View v) { if (geo == null || geo.getCoords() == null) { - final AbstractActivity activity = context.get(); + final AbstractActivity activity = (AbstractActivity) getActivity(); activity.showToast(activity.getResources().getString(R.string.err_point_unknown_position)); return; } @@ -442,7 +447,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { @Override public void onClick(View v) { if (cache == null || cache.getCoords() == null) { - final AbstractActivity activity = context.get(); + final AbstractActivity activity = (AbstractActivity) getActivity(); activity.showToast(activity.getResources().getString(R.string.err_location_unknown)); return; } diff --git a/main/src/cgeo/geocaching/ui/dialog/DateDialog.java b/main/src/cgeo/geocaching/ui/dialog/DateDialog.java index 18f8e2e..fc69f44 100644 --- a/main/src/cgeo/geocaching/ui/dialog/DateDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/DateDialog.java @@ -2,48 +2,56 @@ package cgeo.geocaching.ui.dialog; import cgeo.geocaching.R; -import android.app.Activity; import android.os.Bundle; +import android.support.v4.app.DialogFragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; import android.widget.DatePicker; import java.util.Calendar; -public class DateDialog extends NoTitleDialog { +public class DateDialog extends DialogFragment { public interface DateDialogParent { abstract public void setDate(final Calendar date); } - private final DateDialogParent parent; - private final Calendar date; + private Calendar date; - public DateDialog(Activity contextIn, DateDialogParent parentIn, Calendar dateIn) { - super(contextIn); - - // init - this.date = dateIn; - this.parent = parentIn; + public static DateDialog getInstance(Calendar date) { + DateDialog dd = new DateDialog(); + Bundle args = new Bundle(); + args.putSerializable("date", date); + dd.setArguments(args); + return dd; } @Override - public void onCreate(Bundle savedInstanceState) { + public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setStyle(DialogFragment.STYLE_NO_TITLE, 0); + Bundle args = getArguments(); + date = (Calendar) args.getSerializable("date"); + } - setContentView(R.layout.date); + @Override + public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { + View v = inflater.inflate(R.layout.date, container, false); - final DatePicker picker = (DatePicker) findViewById(R.id.picker); + final DatePicker picker = (DatePicker) v.findViewById(R.id.picker); picker.init(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE), new DatePickerListener()); + return v; } private class DatePickerListener implements DatePicker.OnDateChangedListener { @Override public void onDateChanged(DatePicker picker, int year, int month, int day) { - if (parent != null) { - date.set(year, month, day); + date.set(year, month, day); + + ((DateDialogParent) getActivity()).setDate(date); - parent.setDate(date); - } } } }
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java b/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java deleted file mode 100644 index 8660a7b..0000000 --- a/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.ui.dialog; - -import cgeo.geocaching.utils.Log; - -import android.app.Dialog; -import android.content.Context; -import android.os.Bundle; -import android.view.ViewGroup.LayoutParams; -import android.view.Window; - -public abstract class NoTitleDialog extends Dialog { - - public NoTitleDialog(Context context) { - super(context); - } - - public NoTitleDialog(Context context, int theme) { - super(context, theme); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - try { - requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); - } catch (final Exception e) { - Log.e("NoTitleDialog.onCreate", e); - } - } -} |
