aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2014-05-05 00:23:21 +0200
committerrsudev <rasch@munin-soft.de>2014-05-05 00:23:21 +0200
commit8776f15dd2720d42cf59c6ace64ad5b228d87d7b (patch)
tree87a7aa656cbe877bd2953792ff7aacead8e87093 /main/res
parentaf3886ca3c3275c9ae234d1f346dc798eac13bea (diff)
parentc54322f5fc29e4b8f632521b0b4c1f479528b9d5 (diff)
downloadcgeo-8776f15dd2720d42cf59c6ace64ad5b228d87d7b.zip
cgeo-8776f15dd2720d42cf59c6ace64ad5b228d87d7b.tar.gz
cgeo-8776f15dd2720d42cf59c6ace64ad5b228d87d7b.tar.bz2
Merge pull request #3808 from marco-dev/personalLogsOnFriendsTab
Fixes #1793 - personal logs on friends logs tab
Diffstat (limited to 'main/res')
-rw-r--r--main/res/values/strings.xml6
-rw-r--r--main/res/xml/preferences.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 6a0e571..a9d92d0 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -451,8 +451,8 @@
<string name="init_signature_template_log">Log text</string>
<string name="init_ratingwanted">GCvote Rating</string>
<string name="init_summary_ratingwanted">Load cache rating from GCvote.com</string>
- <string name="init_friendlogswanted">Show Friends\' Logs</string>
- <string name="init_summary_friendlogswanted">Display additional logbook page for logs from friends</string>
+ <string name="init_friends_and_own_logs_wanted">Show Friends\'/Own</string>
+ <string name="init_summary_friends_and_own_logs_wanted">Display additional logbook page for friends\' and own logs</string>
<string name="init_openlastdetailspage">Last Details Page</string>
<string name="init_summary_openlastdetailspage">Open details with last used page</string>
<string name="init_autoload">Long Description</string>
@@ -659,7 +659,7 @@
<string name="cache_waypoints_add">Add Waypoint</string>
<string name="cache_hint">Hint</string>
<string name="cache_logs">Logbook</string>
- <string name="cache_logsfriends">Logbook (Friends)</string>
+ <string name="cache_logs_friends_and_own">Friends/Own Logs</string>
<string name="cache_dialog_loading_details">Loading cache details…</string>
<string name="cache_dialog_loading_details_status_loadpage">Loading page</string>
<string name="cache_dialog_loading_details_status_details">Processing details</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index d550dc8..11d62c5 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -407,8 +407,8 @@
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_friendlogswanted"
- android:summary="@string/init_summary_friendlogswanted"
- android:title="@string/init_friendlogswanted" />
+ android:summary="@string/init_summary_friends_and_own_logs_wanted"
+ android:title="@string/init_friends_and_own_logs_wanted" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_opendetailslastpage"