diff options
31 files changed, 106 insertions, 106 deletions
diff --git a/main/res/drawable/favourite_background_dark.xml b/main/res/drawable/favorite_background_dark.xml index b8aa8d3..b8aa8d3 100644 --- a/main/res/drawable/favourite_background_dark.xml +++ b/main/res/drawable/favorite_background_dark.xml diff --git a/main/res/drawable/favourite_background_green_dark.xml b/main/res/drawable/favorite_background_green_dark.xml index 3e1b545..3e1b545 100644 --- a/main/res/drawable/favourite_background_green_dark.xml +++ b/main/res/drawable/favorite_background_green_dark.xml diff --git a/main/res/drawable/favourite_background_green_light.xml b/main/res/drawable/favorite_background_green_light.xml index a2070e7..a2070e7 100644 --- a/main/res/drawable/favourite_background_green_light.xml +++ b/main/res/drawable/favorite_background_green_light.xml diff --git a/main/res/drawable/favourite_background_light.xml b/main/res/drawable/favorite_background_light.xml index 60c0b2c..60c0b2c 100644 --- a/main/res/drawable/favourite_background_light.xml +++ b/main/res/drawable/favorite_background_light.xml diff --git a/main/res/drawable/favourite_background_orange_dark.xml b/main/res/drawable/favorite_background_orange_dark.xml index 8730487..8730487 100644 --- a/main/res/drawable/favourite_background_orange_dark.xml +++ b/main/res/drawable/favorite_background_orange_dark.xml diff --git a/main/res/drawable/favourite_background_orange_light.xml b/main/res/drawable/favorite_background_orange_light.xml index 89ef726..89ef726 100644 --- a/main/res/drawable/favourite_background_orange_light.xml +++ b/main/res/drawable/favorite_background_orange_light.xml diff --git a/main/res/drawable/favourite_background_red_dark.xml b/main/res/drawable/favorite_background_red_dark.xml index 2fb580e..2fb580e 100644 --- a/main/res/drawable/favourite_background_red_dark.xml +++ b/main/res/drawable/favorite_background_red_dark.xml diff --git a/main/res/drawable/favourite_background_red_light.xml b/main/res/drawable/favorite_background_red_light.xml index b16cb92..b16cb92 100644 --- a/main/res/drawable/favourite_background_red_light.xml +++ b/main/res/drawable/favorite_background_red_light.xml diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml index e3b861c..d4e7b27 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/caches_item.xml @@ -159,14 +159,14 @@ android:src="@drawable/trackable_all" /> <TextView - android:id="@+id/favourite" + android:id="@+id/favorite" android:layout_width="35dip" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_gravity="center" android:layout_marginTop="22dip" - android:background="?favourite" + android:background="?favorite" android:ellipsize="marquee" android:gravity="center" android:lines="1" diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 58e28ac..ac75564 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -175,7 +175,7 @@ <string name="err_missing_device_name">Před registrací prosím zadej název zařízení.</string> <string name="err_favorite_failed">Označení oblíbenosti keše selhalo.</string> <string name="err_select_logimage_failed">Výběr obrázku pro zápis selhal.</string> - <string name="err_aquire_image_failed">Získání obrázku selhalo.</string> + <string name="err_acquire_image_failed">Získání obrázku selhalo.</string> <string name="err_tb_display">c:geo nemůže zobrazit sledovatelný předmět. Je to opravdu sledovatelný předmět?</string> <string name="err_tb_details_open">c:geo nemůže otevřít podrobnosti ke sledovatelnému předmětu.</string> @@ -563,10 +563,10 @@ <string name="cache_dialog_watchlist_add_message">Přidávání keše do tvého Watchlistu…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Odstraňování keše z tvého Watchlistu…</string> - <string name="cache_dialog_favourite_add_title">Oblíbené</string> - <string name="cache_dialog_favourite_add_message">Přidávání keše do Oblíbených…</string> - <string name="cache_dialog_favourite_remove_title">Oblíbené</string> - <string name="cache_dialog_favourite_remove_message">Odstraňování keše z Oblíbených…</string> + <string name="cache_dialog_favorite_add_title">Oblíbené</string> + <string name="cache_dialog_favorite_add_message">Přidávání keše do Oblíbených…</string> + <string name="cache_dialog_favorite_remove_title">Oblíbené</string> + <string name="cache_dialog_favorite_remove_message">Odstraňování keše z Oblíbených…</string> <string name="cache_menu_navigate">Navigovat</string> <string name="cache_menu_navigation_drive">Navigace (Řízení)</string> <string name="cache_menu_navigation_walk">Navigace (Chůze)</string> @@ -608,7 +608,7 @@ <string name="cache_rating">Hodnocení</string> <string name="cache_own_rating">Vlastní hodnocení</string> <string name="cache_rating_of">z</string> - <string name="cache_favourite">Oblíbená</string> + <string name="cache_favorite">Oblíbená</string> <string name="cache_owner">Zakladatel</string> <string name="cache_hidden">Skryta</string> <string name="cache_event">Datum</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 37aa5aa..26fd2d3 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -558,10 +558,10 @@ <string name="cache_dialog_watchlist_add_message">Füge den Cache deiner Watchlist hinzu…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Entferne den Cache von deiner Watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favorit</string> - <string name="cache_dialog_favourite_add_message">Füge den Cache als dein Favorit hinzu…</string> - <string name="cache_dialog_favourite_remove_title">Favorit</string> - <string name="cache_dialog_favourite_remove_message">Entferne den Cache von deinen Favoriten…</string> + <string name="cache_dialog_favorite_add_title">Favorit</string> + <string name="cache_dialog_favorite_add_message">Füge den Cache zu Favoriten hinzu…</string> + <string name="cache_dialog_favorite_remove_title">Favorit</string> + <string name="cache_dialog_favorite_remove_message">Entferne den Cache von deinen Favoriten…</string> <string name="cache_menu_navigate">Navigieren</string> <string name="cache_menu_navigation_drive">Navigation (Fahren)</string> <string name="cache_menu_navigation_walk">Navigation (Gehen)</string> @@ -604,7 +604,7 @@ <string name="cache_rating">Bewertung</string> <string name="cache_own_rating">Eigene Bewertung</string> <string name="cache_rating_of">von</string> - <string name="cache_favourite">Favorit</string> + <string name="cache_favorite">Favorit</string> <string name="cache_owner">Besitzer</string> <string name="cache_hidden">Versteckt</string> <string name="cache_event">Zeitangabe</string> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index b3096eb..f029d9b 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -485,7 +485,7 @@ <string name="cache_terrain">Terreno</string> <string name="cache_rating">Puntuación</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favorito</string> + <string name="cache_favorite">Favorito</string> <string name="cache_owner">Propietario</string> <string name="cache_hidden">Oculto</string> <string name="cache_event">Fecha</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index f7a6fde..a0f86e6 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -175,7 +175,7 @@ <string name="err_missing_device_name">Veuillez saisir un nom pour votre appareil avant l\'enregistrement.</string> <string name="err_favorite_failed">c:geo ne peut pas changer le status de favori.</string> <string name="err_select_logimage_failed">La sélection d\'une image pour la note a échoué.</string> - <string name="err_aquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string> + <string name="err_acquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string> <string name="err_tb_display">"c:geo ne peut pas afficher l\'objet voyageur demandé. Est-ce vraiment un objet voyageur?</string> <string name="err_tb_details_open">c:geo ne peut pas ouvrir le détail de l\'objet voyageur.</string> @@ -561,10 +561,10 @@ <string name="cache_dialog_watchlist_add_message">Ajout de la cache à votre liste de suivi…</string> <string name="cache_dialog_watchlist_remove_title">Liste de suivi</string> <string name="cache_dialog_watchlist_remove_message">Retrait de la cache de votre liste de suivi…</string> - <string name="cache_dialog_favourite_add_title">Favori</string> - <string name="cache_dialog_favourite_add_message">Ajout de la cache à vos favoris…</string> - <string name="cache_dialog_favourite_remove_title">Favori</string> - <string name="cache_dialog_favourite_remove_message">Suppression de la cache de vos favoris…</string> + <string name="cache_dialog_favorite_add_title">Favori</string> + <string name="cache_dialog_favorite_add_message">Ajout de la cache à vos favoris…</string> + <string name="cache_dialog_favorite_remove_title">Favori</string> + <string name="cache_dialog_favorite_remove_message">Suppression de la cache de vos favoris…</string> <string name="cache_menu_navigate">Navigation</string> <string name="cache_menu_navigation_drive">Navigation (voiture)</string> <string name="cache_menu_navigation_walk">Navigation (piéton)</string> @@ -606,7 +606,7 @@ <string name="cache_rating">Note</string> <string name="cache_own_rating">Note personnelle</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favori</string> + <string name="cache_favorite">Favori</string> <string name="cache_owner">Propriétaire</string> <string name="cache_hidden">Cachée</string> <string name="cache_event">Date</string> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 353aa10..e7018f9 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -568,7 +568,7 @@ <string name="cache_rating">Osztályzat</string> <string name="cache_own_rating">Saját értékelés</string> <string name="cache_rating_of">/</string> - <string name="cache_favourite">Kedvenc</string> + <string name="cache_favorite">Kedvenc</string> <string name="cache_owner">Tulajdonos</string> <string name="cache_hidden">Elrejtve</string> <string name="cache_event">Dátum</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 98a3f9c..ab43e86 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -176,7 +176,7 @@ <string name="err_favorite_failed">Errore nella modifica dello stato preferiti.</string> <string name="err_select_logimage_failed">La selezione dell\'immagine per il log è fallita.</string> - <string name="err_aquire_image_failed">Acquisizione immagine fallita.</string> + <string name="err_acquire_image_failed">Acquisizione immagine fallita.</string> <string name="err_tb_display">c:geo non riesce a visualizzare il trackable che vuoi. È veramente un trackable?</string> <string name="err_tb_details_open">c:geo non riesce ad aprire i dettagli del trackable.</string> @@ -556,10 +556,10 @@ <string name="cache_dialog_watchlist_add_message">Aggiunto il cache alla watchlist in corso…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Rimozione dei cache dalla tua watchlist…</string> - <string name="cache_dialog_favourite_add_title">Preferiti</string> - <string name="cache_dialog_favourite_add_message">Aggiungi il cache ai tuoi preferiti…</string> - <string name="cache_dialog_favourite_remove_title">Preferiti</string> - <string name="cache_dialog_favourite_remove_message">Rimozione cache dai tuoi preferiti…</string> + <string name="cache_dialog_favorite_add_title">Preferiti</string> + <string name="cache_dialog_favorite_add_message">Aggiungi il cache ai tuoi preferiti…</string> + <string name="cache_dialog_favorite_remove_title">Preferiti</string> + <string name="cache_dialog_favorite_remove_message">Rimozione cache dai tuoi preferiti…</string> <string name="cache_menu_navigate">Naviga</string> <string name="cache_menu_navigation_drive">Naviga (in auto)</string> <string name="cache_menu_navigation_walk">Naviga (a piedi)</string> @@ -601,7 +601,7 @@ <string name="cache_rating">Voto</string> <string name="cache_own_rating">Il tuo voto</string> <string name="cache_rating_of">di</string> - <string name="cache_favourite">Popolarità</string> + <string name="cache_favorite">Popolarità</string> <string name="cache_owner">Proprietario</string> <string name="cache_hidden">Nascosto il</string> <string name="cache_event">Data</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 27ffbd3..5d7759e 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -540,10 +540,10 @@ <string name="cache_dialog_watchlist_add_message">ウォッチリストに追加中…</string> <string name="cache_dialog_watchlist_remove_title">ウォッチリスト</string> <string name="cache_dialog_watchlist_remove_message">ウォッチリストから削除中…</string> - <string name="cache_dialog_favourite_add_title">お気に入り</string> - <string name="cache_dialog_favourite_add_message">お気に入りに追加中…</string> - <string name="cache_dialog_favourite_remove_title">お気に入り</string> - <string name="cache_dialog_favourite_remove_message">お気に入りから削除中…</string> + <string name="cache_dialog_favorite_add_title">お気に入り</string> + <string name="cache_dialog_favorite_add_message">お気に入りに追加中…</string> + <string name="cache_dialog_favorite_remove_title">お気に入り</string> + <string name="cache_dialog_favorite_remove_message">お気に入りから削除中…</string> <string name="cache_menu_navigate">ナビゲーション</string> <string name="cache_menu_navigation_drive">ナビゲーション(自動車)</string> <string name="cache_menu_navigation_walk">ナビゲーション(徒歩)</string> @@ -586,7 +586,7 @@ <string name="cache_rating">評価</string> <string name="cache_own_rating">Own Rating</string> <string name="cache_rating_of">/</string> - <string name="cache_favourite">お気に入り</string> + <string name="cache_favorite">お気に入り</string> <string name="cache_owner">所有者</string> <string name="cache_hidden">隠した日</string> <string name="cache_event">イベント日付</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 557aa79..8ce95a5 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -546,10 +546,10 @@ <string name="cache_dialog_watchlist_add_message">Voeg cache toe aan watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Verwijder cache van watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favoriet</string> - <string name="cache_dialog_favourite_add_message">Voeg cache toe aan favorieten…</string> - <string name="cache_dialog_favourite_remove_title">Favoriet</string> - <string name="cache_dialog_favourite_remove_message">Verwijder cache van je favorieten…</string> + <string name="cache_dialog_favorite_add_title">Favoriet</string> + <string name="cache_dialog_favorite_add_message">Voeg cache toe aan favorieten…</string> + <string name="cache_dialog_favorite_remove_title">Favoriet</string> + <string name="cache_dialog_favorite_remove_message">Verwijder cache van je favorieten…</string> <string name="cache_menu_navigate">Navigeer</string> <string name="cache_menu_navigation_drive">Navigeer (rijden)</string> <string name="cache_menu_navigation_walk">Navigeer (lopen)</string> @@ -591,7 +591,7 @@ <string name="cache_rating">Waardering</string> <string name="cache_own_rating">Eigen waardering</string> <string name="cache_rating_of">van</string> - <string name="cache_favourite">Favoriet</string> + <string name="cache_favorite">Favoriet</string> <string name="cache_owner">Eigenaar</string> <string name="cache_hidden">Verstopt</string> <string name="cache_event">Datum</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 1f23f63..b4fbca7 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -533,10 +533,10 @@ <string name="cache_dialog_watchlist_add_message">Dodaję skrzynkę do listy obserwowanych…</string> <string name="cache_dialog_watchlist_remove_title">Lista obserwowanych</string> <string name="cache_dialog_watchlist_remove_message">Usuwam skrzynkę z listy obserwowanych…</string> - <string name="cache_dialog_favourite_add_title">Ulubione</string> - <string name="cache_dialog_favourite_add_message">Dodaję skrzynkę do listy ulubionych…</string> - <string name="cache_dialog_favourite_remove_title">Ulubione</string> - <string name="cache_dialog_favourite_remove_message">Usuwam skrzynkę z listy ulubionych…</string> + <string name="cache_dialog_favorite_add_title">Ulubione</string> + <string name="cache_dialog_favorite_add_message">Dodaję skrzynkę do listy ulubionych…</string> + <string name="cache_dialog_favorite_remove_title">Ulubione</string> + <string name="cache_dialog_favorite_remove_message">Usuwam skrzynkę z listy ulubionych…</string> <string name="cache_menu_navigate">Nawiguj</string> <string name="cache_menu_navigation_drive">Nawigacja (jazda)</string> <string name="cache_menu_navigation_walk">Nawigacja (pieszo)</string> @@ -578,7 +578,7 @@ <string name="cache_rating">Ocena</string> <string name="cache_own_rating">Własna ocena</string> <string name="cache_rating_of">od</string> - <string name="cache_favourite">Ulubiona</string> + <string name="cache_favorite">Ulubiona</string> <string name="cache_owner">Właściciel</string> <string name="cache_hidden">Ukryta</string> <string name="cache_event">Data</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index d6ee413..e4bcfd4 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -571,7 +571,7 @@ <string name="cache_rating">Pontuação</string> <string name="cache_own_rating">A minha pontuação</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favorita</string> + <string name="cache_favorite">Favorita</string> <string name="cache_owner">Dono</string> <string name="cache_hidden">Escondida</string> <string name="cache_event">Data</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index ef316ea..616bd44 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -570,7 +570,7 @@ <string name="cache_rating">Hodnotenie</string> <string name="cache_own_rating">Vlastné hodnotenie</string> <string name="cache_rating_of">z</string> - <string name="cache_favourite">Obľúbené</string> + <string name="cache_favorite">Obľúbené</string> <string name="cache_owner">Vlastník</string> <string name="cache_hidden">Skrytá</string> <string name="cache_event">Dátum</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index b68de4c..0f23eed 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -176,7 +176,7 @@ <string name="err_favorite_failed">Misslyckades att ändra favoritstatus.</string> <string name="err_select_logimage_failed">Misslyckades att välja bild till loggen.</string> - <string name="err_aquire_image_failed">Hämtning av bilden misslyckades.</string> + <string name="err_acquire_image_failed">Hämtning av bilden misslyckades.</string> <string name="err_tb_display">Tyvärr kan c:geo inte visa den trackable du önskar. Är den verkligen trackable?</string> <string name="err_tb_details_open">Tyvärr kan c:geo inte öppna detaljer för trackable.</string> <string name="err_tb_forgot_saw">Tyvärr glömde c:geo vilken trackable du såg.</string> @@ -561,10 +561,10 @@ <string name="cache_dialog_watchlist_add_message">Lägger till cachen till din watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Tar bort cachen från din watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favorit</string> - <string name="cache_dialog_favourite_add_message">Lägger till cachen till dina favoriter…</string> - <string name="cache_dialog_favourite_remove_title">Favorit</string> - <string name="cache_dialog_favourite_remove_message">Tar bort cachen från dina favoriter…</string> + <string name="cache_dialog_favorite_add_title">Favorit</string> + <string name="cache_dialog_favorite_add_message">Lägger till cachen till dina favoriter…</string> + <string name="cache_dialog_favorite_remove_title">Favorit</string> + <string name="cache_dialog_favorite_remove_message">Tar bort cachen från dina favoriter…</string> <string name="cache_menu_navigate">Navigera</string> <string name="cache_menu_navigation_drive">Navigering (med bil)</string> <string name="cache_menu_navigation_walk">Navigering (till fots)</string> @@ -606,7 +606,7 @@ <string name="cache_rating">Betyg</string> <string name="cache_own_rating">Eget betyg</string> <string name="cache_rating_of">av</string> - <string name="cache_favourite">Favorit</string> + <string name="cache_favorite">Favorit</string> <string name="cache_owner">Ägare</string> <string name="cache_hidden">Gömd</string> <string name="cache_event">Datum</string> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 558c353..092d307 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -22,10 +22,10 @@ <attr name="button" format="integer" /> <attr name="input" format="integer" /> <attr name="inventory" format="integer" /> - <attr name="favourite" format="integer" /> - <attr name="favourite_r" format="integer" /> - <attr name="favourite_o" format="integer" /> - <attr name="favourite_g" format="integer" /> + <attr name="favorite" format="integer" /> + <attr name="favorite_r" format="integer" /> + <attr name="favorite_o" format="integer" /> + <attr name="favorite_g" format="integer" /> <attr name="close" format="integer" /> <attr name="log_img_icon" format="integer" /> <attr name="actionbar_compass" format="integer" /> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index b7e1f8d..42abb8f 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -183,7 +183,7 @@ <string name="err_missing_device_name">Please enter a device name before registering.</string> <string name="err_favorite_failed">Changing favorite status failed.</string> <string name="err_select_logimage_failed">Selecting an image for the log failed.</string> - <string name="err_aquire_image_failed">Acquiring an image failed.</string> + <string name="err_acquire_image_failed">Acquiring an image failed.</string> <string name="err_tb_display">c:geo can\'t display trackable you want. Is it really a trackable?</string> <string name="err_tb_details_open">c:geo can\'t open trackable details.</string> @@ -569,10 +569,10 @@ <string name="cache_dialog_watchlist_add_message">Adding cache to your watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Removing cache from your watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favourite</string> - <string name="cache_dialog_favourite_add_message">Adding cache to your favourites…</string> - <string name="cache_dialog_favourite_remove_title">Favourite</string> - <string name="cache_dialog_favourite_remove_message">Removing cache from your favourites…</string> + <string name="cache_dialog_favorite_add_title">Favorite</string> + <string name="cache_dialog_favorite_add_message">Adding cache to your favorites…</string> + <string name="cache_dialog_favorite_remove_title">Favorite</string> + <string name="cache_dialog_favorite_remove_message">Removing cache from your favorites…</string> <string name="cache_menu_navigate">Navigate</string> <string name="cache_menu_navigation_drive">Navigation (Driving)</string> <string name="cache_menu_navigation_walk">Navigation (Walking)</string> @@ -616,7 +616,7 @@ <string name="cache_rating">Rating</string> <string name="cache_own_rating">Own Rating</string> <string name="cache_rating_of">of</string> - <string name="cache_favourite">Favorite</string> + <string name="cache_favorite">Favorite</string> <string name="cache_owner">Owner</string> <string name="cache_hidden">Hidden</string> <string name="cache_event">Date</string> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index fdc2eeb..655d9e1 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -36,10 +36,10 @@ <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="favourite">@drawable/favourite_background_dark</item> - <item name="favourite_r">@drawable/favourite_background_red_dark</item> - <item name="favourite_o">@drawable/favourite_background_orange_dark</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -67,10 +67,10 @@ <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="favourite">@drawable/favourite_background_light</item> - <item name="favourite_r">@drawable/favourite_background_red_light</item> - <item name="favourite_o">@drawable/favourite_background_orange_light</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -109,10 +109,10 @@ <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="favourite">@drawable/favourite_background_dark</item> - <item name="favourite_r">@drawable/favourite_background_red_dark</item> - <item name="favourite_o">@drawable/favourite_background_orange_dark</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -141,10 +141,10 @@ <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="favourite">@drawable/favourite_background_light</item> - <item name="favourite_r">@drawable/favourite_background_red_light</item> - <item name="favourite_o">@drawable/favourite_background_orange_light</item> - <item name="favourite_g">@drawable/favourite_background_green_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> diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java index 5769887..5ad89fb 100644 --- a/main/src/cgeo/geocaching/AbstractPopupActivity.java +++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java @@ -278,8 +278,8 @@ public abstract class AbstractPopupActivity extends AbstractActivity { aquireGCVote(); } - // favourite count - details.add(R.string.cache_favourite, cache.getFavoritePoints() + "×"); + // favorite count + details.add(R.string.cache_favorite, cache.getFavoritePoints() + "×"); // more details final Button buttonMore = (Button) findViewById(R.id.more_details); diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index d9ef503..fd42f07 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1163,7 +1163,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc // favorite count if (cache.getFavoritePoints() > 0) { - details.add(R.string.cache_favourite, cache.getFavoritePoints() + "×"); + details.add(R.string.cache_favorite, cache.getFavoritePoints() + "×"); } // own rating @@ -1487,7 +1487,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } } - /** Thread to add this cache to the favourite list of the user */ + /** Thread to add this cache to the favorite list of the user */ private class FavoriteAddThread extends Thread { private final Handler handler; @@ -1501,7 +1501,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } } - /** Thread to remove this cache to the favourite list of the user */ + /** Thread to remove this cache to the favorite list of the user */ private class FavoriteRemoveThread extends Thread { private final Handler handler; @@ -1528,25 +1528,25 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } /** - * Listener for "add to favourites" button + * Listener for "add to favorites" button */ private class FavoriteAddClickListener extends AbstractWatchlistClickListener { @Override public void onClick(View arg0) { - doExecute(R.string.cache_dialog_favourite_add_title, - R.string.cache_dialog_favourite_add_message, + doExecute(R.string.cache_dialog_favorite_add_title, + R.string.cache_dialog_favorite_add_message, new FavoriteAddThread(new FavoriteUpdateHandler())); } } /** - * Listener for "remove from favourites" button + * Listener for "remove from favorites" button */ private class FavoriteRemoveClickListener extends AbstractWatchlistClickListener { @Override public void onClick(View arg0) { - doExecute(R.string.cache_dialog_favourite_remove_title, - R.string.cache_dialog_favourite_remove_message, + doExecute(R.string.cache_dialog_favorite_remove_title, + R.string.cache_dialog_favorite_remove_message, new FavoriteRemoveThread(new FavoriteUpdateHandler())); } } diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java index 000435e..705f2ed 100644 --- a/main/src/cgeo/geocaching/Geocache.java +++ b/main/src/cgeo/geocaching/Geocache.java @@ -763,8 +763,8 @@ public class Geocache implements ICache, IWaypoint { return favorite; } - public void setFavorite(boolean favourite) { - this.favorite = favourite; + public void setFavorite(boolean favorite) { + this.favorite = favorite; } @Override diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java index 34b433d..7c8df5a 100644 --- a/main/src/cgeo/geocaching/ImageSelectActivity.java +++ b/main/src/cgeo/geocaching/ImageSelectActivity.java @@ -278,7 +278,7 @@ public class ImageSelectActivity extends AbstractActivity { } private void showFailure() { - showToast(getResources().getString(R.string.err_aquire_image_failed)); + showToast(getResources().getString(R.string.err_acquire_image_failed)); } private void loadImagePreview() { diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java index 32d428a..d5002a0 100644 --- a/main/src/cgeo/geocaching/cgData.java +++ b/main/src/cgeo/geocaching/cgData.java @@ -108,7 +108,7 @@ public class cgData { + "detailedupdate long, " + "visiteddate long, " + "geocode text unique not null, " - + "reason integer not null default 0, " // cached, favourite... + + "reason integer not null default 0, " // cached, favorite... + "cacheid text, " + "guid text, " + "type text, " diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index d566b2f..4273da5 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -215,7 +215,7 @@ public abstract class GCParser { cache.setFavoritePoints(Integer.parseInt(result)); } } catch (NumberFormatException e) { - Log.w("GCParser.parseSearch: Failed to parse favourite count"); + Log.w("GCParser.parseSearch: Failed to parse favorite count"); } searchResult.addCache(cache); @@ -424,11 +424,11 @@ public abstract class GCParser { Log.w("GCParser.parseCache: Failed to parse cache hidden (event) date"); } - // favourite + // favorite try { cache.setFavoritePoints(Integer.parseInt(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_FAVORITECOUNT, true, "0"))); } catch (NumberFormatException e) { - Log.e("Error parsing favourite count", e); + Log.e("Error parsing favorite count", e); } // cache size diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java index 4965e0b..b60586e 100644 --- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java @@ -79,13 +79,13 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { private static final int[] RATING_BACKGROUND = new int[3]; static { if (Settings.isLightSkin()) { - RATING_BACKGROUND[0] = R.drawable.favourite_background_red_light; - RATING_BACKGROUND[1] = R.drawable.favourite_background_orange_light; - RATING_BACKGROUND[2] = R.drawable.favourite_background_green_light; + RATING_BACKGROUND[0] = R.drawable.favorite_background_red_light; + RATING_BACKGROUND[1] = R.drawable.favorite_background_orange_light; + RATING_BACKGROUND[2] = R.drawable.favorite_background_green_light; } else { - RATING_BACKGROUND[0] = R.drawable.favourite_background_red_dark; - RATING_BACKGROUND[1] = R.drawable.favourite_background_orange_dark; - RATING_BACKGROUND[2] = R.drawable.favourite_background_green_dark; + RATING_BACKGROUND[0] = R.drawable.favorite_background_red_dark; + RATING_BACKGROUND[1] = R.drawable.favorite_background_orange_dark; + RATING_BACKGROUND[2] = R.drawable.favorite_background_green_dark; } } @@ -97,7 +97,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { CheckBox checkbox; ImageView logStatusMark; TextView text; - TextView favourite; + TextView favorite; TextView info; ImageView inventory; RelativeLayout directionLayout; @@ -364,7 +364,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { holder.dirImgLayout = (RelativeLayout) v.findViewById(R.id.dirimg_layout); holder.dirImg = (ImageView) v.findViewById(R.id.dirimg); holder.inventory = (ImageView) v.findViewById(R.id.inventory); - holder.favourite = (TextView) v.findViewById(R.id.favourite); + holder.favorite = (TextView) v.findViewById(R.id.favorite); holder.info = (TextView) v.findViewById(R.id.info); v.setTag(holder); @@ -494,14 +494,14 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { } } - holder.favourite.setText(Integer.toString(cache.getFavoritePoints())); + holder.favorite.setText(Integer.toString(cache.getFavoritePoints())); int favoriteBack; // set default background, neither vote nor rating may be available if (lightSkin) { - favoriteBack = R.drawable.favourite_background_light; + favoriteBack = R.drawable.favorite_background_light; } else { - favoriteBack = R.drawable.favourite_background_dark; + favoriteBack = R.drawable.favorite_background_dark; } final float myVote = cache.getMyVote(); if (myVote > 0) { // use my own rating for display, if I have voted @@ -522,7 +522,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { favoriteBack = RATING_BACKGROUND[0]; } } - holder.favourite.setBackgroundResource(favoriteBack); + holder.favorite.setBackgroundResource(favoriteBack); if (cacheListType == CacheListType.HISTORY && cache.getVisitedDate() > 0) { holder.info.setText(Formatter.formatCacheInfoHistory(cache)); |