Skip to content

Commit

Permalink
Merge branch release
Browse files Browse the repository at this point in the history
  • Loading branch information
Lineflyer committed Apr 23, 2019
2 parents 53eaf6e + 42d5657 commit 1f2071e
Show file tree
Hide file tree
Showing 27 changed files with 1 addition and 27 deletions.
1 change: 0 additions & 1 deletion main/res/values-ca/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activa</string>
<string name="settings_activate_ec">Activa</string>
<string name="settings_activate_ox">Activa</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-ceb/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Pag-aktibo</string>
<string name="settings_activate_ec">Pag-aktibo</string>
<string name="settings_activate_ox">Pag-aktibo</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-cs/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivovat</string>
<string name="settings_activate_ec">Aktivovat</string>
<string name="settings_activate_ox">Aktivovat</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-da/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivér</string>
<string name="settings_activate_ec">Aktivér</string>
<string name="settings_activate_ox">Aktivér</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-de/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivieren</string>
<string name="settings_activate_ec">Aktivieren</string>
<string name="settings_activate_ox">Aktivieren</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-el/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Ενεργοποίηση</string>
<string name="settings_activate_ec">Ενεργοποίηση</string>
<string name="settings_activate_ox">Ενεργοποίηση</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-es/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activar</string>
<string name="settings_activate_ec">Activar</string>
<string name="settings_activate_ox">Activar</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-fi/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivoi</string>
<string name="settings_activate_ec">Aktivoi</string>
<string name="settings_activate_ox">Aktivoi</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-fr/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activer</string>
<string name="settings_activate_ec">Activer</string>
<string name="settings_activate_ox">Activer</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-hu/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktiválás</string>
<string name="settings_activate_ec">Aktiválás</string>
<string name="settings_activate_ox">Aktiválás</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-it/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">OpenCaching.com (Garmin)</string>
<string name="settings_activate_gc">Attiva</string>
<string name="settings_activate_ec">Attiva</string>
<string name="settings_activate_ox">Attiva</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-ja/strings.xml
Expand Up @@ -462,7 +462,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">有効化</string>
<string name="settings_activate_ec">有効化</string>
<string name="settings_activate_ox">有効化</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-ko/strings.xml
Expand Up @@ -462,7 +462,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">활성화</string>
<string name="settings_activate_ec">활성화</string>
<string name="settings_activate_ox">활성화</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-lt/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktyvuoti</string>
<string name="settings_activate_ec">Aktyvuoti</string>
<string name="settings_activate_ox">Aktyvuoti</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-lv/strings.xml
Expand Up @@ -468,7 +468,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivizēt</string>
<string name="settings_activate_ec">Aktivizēt</string>
<string name="settings_activate_ox">Aktivizēt</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-nb/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktiver</string>
<string name="settings_activate_ec">Aktiver</string>
<string name="settings_activate_ox">Aktiver</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-nl/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activeren</string>
<string name="settings_activate_ec">Activeren</string>
<string name="settings_activate_ox">Activeren</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-pl/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktywuj</string>
<string name="settings_activate_ec">Aktywuj</string>
<string name="settings_activate_ox">Aktywuj</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-pt/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activar</string>
<string name="settings_activate_ec">Activar</string>
<string name="settings_activate_ox">Activar</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-ro/strings.xml
Expand Up @@ -468,7 +468,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activează</string>
<string name="settings_activate_ec">Activează</string>
<string name="settings_activate_ox">Activează</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-ru/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Активировать</string>
<string name="settings_activate_ec">Активировать</string>
<string name="settings_activate_ox">Активировать</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-sk/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivovať</string>
<string name="settings_activate_ec">Aktivovať</string>
<string name="settings_activate_ox">Aktivovať</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-sl/strings.xml
Expand Up @@ -471,7 +471,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktiviraj</string>
<string name="settings_activate_ec">Aktiviraj</string>
<string name="settings_activate_ox">Aktiviraj</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-sv/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Aktivera</string>
<string name="settings_activate_ec">Aktivera</string>
<string name="settings_activate_ox">Aktivera</string>
Expand Down
1 change: 0 additions & 1 deletion main/res/values-tr/strings.xml
Expand Up @@ -465,7 +465,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Etkinleştir</string>
<string name="settings_activate_ec">Etkinleştir</string>
<string name="settings_activate_ox">Etkinleştir</string>
Expand Down
2 changes: 1 addition & 1 deletion main/res/values/changelog_release.xml
Expand Up @@ -2,7 +2,7 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
<b>Next release:</b>\n
<b>2019.04.16:</b>\n
· New: Show map icon on address search result to directly jump to the live map\n
· New: Show cache status overlay icons also in title bar of cache details\n
· New: Implement geocaching.su\n
Expand Down
1 change: 0 additions & 1 deletion main/res/values/strings.xml
Expand Up @@ -491,7 +491,6 @@
<string name="settings_title_gc">Geocaching.com</string>
<string name="settings_title_ec">Extremcaching.com</string>
<string name="settings_title_su">Geocaching.su</string>
<string name="settings_title_ox">Opencaching.com (Garmin)</string>
<string name="settings_activate_gc">Activate</string>
<string name="settings_activate_ec">Activate</string>
<string name="settings_activate_ox">Activate</string>
Expand Down

0 comments on commit 1f2071e

Please sign in to comment.