diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-06-17 07:13:58 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-06-17 07:13:58 +0200 |
| commit | 23c04234b6608f6b56a8e5fecf20d9787f116888 (patch) | |
| tree | e7867d21f82417128ccd88f1d2b8485e52e1dca3 /main/res/values-cs | |
| parent | ca2b81fddcd071be8379c94318979634fb91e054 (diff) | |
| parent | ee17c22f41cff696218c878a0c426d1e7dd85497 (diff) | |
| download | cgeo-23c04234b6608f6b56a8e5fecf20d9787f116888.zip cgeo-23c04234b6608f6b56a8e5fecf20d9787f116888.tar.gz cgeo-23c04234b6608f6b56a8e5fecf20d9787f116888.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-cs/strings.xml
main/res/values/strings.xml
Diffstat (limited to 'main/res/values-cs')
| -rw-r--r-- | main/res/values-cs/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 63eb494..fd262e1 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -523,7 +523,7 @@ <string name="map_view_map">pohled do mapy</string> <string name="map_trail_show">zobrazit záznam trasy</string> <string name="map_trail_hide">skrýt záznam trasy</string> - <string name="map_live_enable">povolit aktivní mapu</string> + <string name="map_live_enable">povolit aktivní mapu</string> <string name="map_live_disable">zakázat aktivní mapu</string> <string name="map_static_title">statické mapy</string> <string name="map_static_loading">načítání statických map…</string> |