aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-02 23:02:10 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-02 23:02:10 +0100
commita0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch)
tree9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/res/values
parent6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff)
parent9efc13983516c4c37540eb9544f8fa411ded81c7 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/strings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 33f89e7a..3bba4c9d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -529,4 +529,10 @@
<string name="cplus_no">No</string>
<string name="cplus_remember_userdecision">Remember this decision</string>
<string name="userdecision_question_resize_picture">Shall the picture be resized?</string>
+ <string name="title_activity_loginformation">Logoutput</string>
+ <string name="cplus_copy_to_clipboard">Copy to clipboard</string>
+ <string name="cplus_copied_to_clipboard">Copied to clipboard</string>
+ <string name="pref_show_logcat_title">Show logcat output</string>
+ <string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string>
+ <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string>
</resources>