aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-31 21:40:45 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-31 21:40:45 +0200
commit5f8de512f5d14515146d341bc3e0ae0e066837b8 (patch)
tree87f6b90d606db834f2503549b4c82f18bae1a376 /src/main/res/values/strings.xml
parentc23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (diff)
parent9e724edb42d8cb0fa8745f88a80d914df09f4ff6 (diff)
Merge remote-tracking branch 'refs/remotes/origin/new_version'
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f25918008..aec0e3a43 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -642,5 +642,9 @@
<string name="conference_subject">Subject</string>
<string name="choose_participants">Choose participants</string>
<string name="creating_conference">Creating conferenceā€¦</string>
+ <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string>
+ <string name="import_database">Import backup</string>
+ <string name="uninstall_app_text">There is an old version of Pix-Art Messenger or Conversations installed. If you have an old Pix-Art Messenger installed, you should uninstall this version. After uninstalled the old versoin, you should choose \'import backup\' again and we will import your data to the new version.</string>
+ <string name="you">You</string>
</resources>