diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-07-19 17:00:20 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-07-19 17:00:20 +0200 |
| commit | 07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2 (patch) | |
| tree | cadebfd0d4dd1289fd53464bf778dcfa4e8ed5bf | |
| parent | 70b56e101917d5c141bd2f48c784da8f9829fb11 (diff) | |
| download | cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.zip cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.tar.gz cgeo-07f3b3337f2f3bac0a4c1f16b82e2d283cc9f0d2.tar.bz2 | |
fix conflict from manual merge in strings.xml
| -rw-r--r-- | main/res/values/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index cc7b239..c0bbded 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -372,7 +372,8 @@ <string name="settings_title_map_content">Map Content</string> <string name="settings_title_gpx">GPX</string> <string name="settings_title_basicmembers">Basic Members</string> - <string name="settings_title_miscellaneous">More Settings</string> + <string name="settings_title_navigation">Navigation</string> + <string name="settings_title_system">System</string> <string name="settings_category_browser">Browser</string> <string name="settings_category_logging_other">Other Logging Options</string> |