aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-07 15:36:16 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-07 15:36:16 +0200
commit36f3bed2eccb3dfd5266304c482497eff0d25c7c (patch)
treea43598541a1a4ea92142d17e02c02033e49fa8a3 /src/main/res/values
parent4ace80d39ade18934d310ba37559c9c7ec8004dd (diff)
parent8c3245dd1f257053b8ec2bf7c5e03a3a98b282c3 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e939114..2578f0a8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -666,4 +666,5 @@
<string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string>
<string name="select_image_and_crop">Select image and crop</string>
<string name="this_account_is_disabled">You have disabled this account</string>
+ <string name="cplus_copy_item">Copy item</string>
</resources>