diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
| commit | 5fcce648e200669f1ae0875c7aea9dc3a4a37574 (patch) | |
| tree | f3741fdf0c8fcb6e6728fa49d61af7ea6c7f1aaa /main/res/values/preference_keys.xml | |
| parent | 6b2972bfd1fdc14cd84f78e3674e97b46675345d (diff) | |
| parent | 786eccacbb285696d504d08ba02c61400ce063a2 (diff) | |
| download | cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.zip cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.gz cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.bz2 | |
Merge remote-tracking branch 'schwabe/actionbar_pullrequest'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/CgeoApplication.java
Diffstat (limited to 'main/res/values/preference_keys.xml')
| -rw-r--r-- | main/res/values/preference_keys.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index 4423e33..2e3de84 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -46,6 +46,7 @@ <string name="pref_showaddress">showaddress</string> <string name="pref_useenglish">useenglish</string> <string name="pref_units">units</string> + <string name="pref_alwaysshowoverflowmenu">alwaysshowoverflowmenu</string> <string name="pref_autoloaddesc">autoloaddesc</string> <string name="pref_ratingwanted">ratingwanted</string> <string name="pref_friendlogswanted">friendlogswanted</string> @@ -169,4 +170,5 @@ <string name="pref_twitter_trackable_message">twitter_trackable_message</string> <string name="pref_ec_icons">ec_icons</string> <string name="pref_memory_dump">memory_dump</string> -</resources>
\ No newline at end of file + <string name="pref_appearance">pref_appearence</string> +</resources> |