diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
| commit | ec9af65d1d5130b0c046c58b964dfd04944eb218 (patch) | |
| tree | 78da645e466adb2b51ec32ac5f1a2a1f9757eb91 /main/res | |
| parent | e30e955b3a9800ea783f36f64c42bfc19c795658 (diff) | |
| parent | 213818180224cfea540e078708215f27be09d7d6 (diff) | |
| download | cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.zip cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.gz cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-fr/strings.xml
main/res/values/strings.xml
send2cgeo/send2cgeo.user.js
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values-fr/strings.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 6c58637..dc1d885 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -1063,6 +1063,7 @@ <string name="status_new_rc" tools:ignore="UnusedResources">Nouvelle version candidate disponible.\nCliquer pour installer.</string> <string name="status_geocaching_change" tools:ignore="UnusedResources">Des changements récents sur Geocaching.com ont cassé c:geo.\nNous sommes en train de nous en occuper.</string> <string name="status_geocaching_livemap" tools:ignore="UnusedResources">Des changements récents sur Geocaching.com ont cassé la carte active.\nNous sommes en train de nous en occuper.</string> + <string name="status_closeout_warning" tools:ignore="UnusedResources">Vous utilisez une version d\'Android inférieure à 2.1. Les futures versions de c:geo pourront ne pas être disponibles pour votre appareil.</string> <!-- text-to-speech for compass view --> <string name="tts_service">Boussole parlante</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 05cdb3d..19dbc60 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -1091,6 +1091,7 @@ <string name="status_new_rc" tools:ignore="UnusedResources">New release candidate available.\nClick to install.</string> <string name="status_geocaching_change" tools:ignore="UnusedResources">Recent changes on geocaching.com broke c:geo.\nWe are working on it, check again soon.</string> <string name="status_geocaching_livemap" tools:ignore="UnusedResources">Recent changes on geocaching.com broke the live map feature.\nWe are working on it, check again soon.</string> + <string name="status_closeout_warning" tools:ignore="UnusedResources">You appear to be using a version of Android older than 2.1. Future releases of c:geo might no longer be available for your device.</string> <!-- text-to-speech for compass view --> <string name="tts_service">Talking compass</string> @@ -1127,4 +1128,4 @@ <item quantity="other">%d days ago</item> </plurals> -</resources>
\ No newline at end of file +</resources> |