diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:29:45 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:29:45 +0200 |
| commit | 9e724edb42d8cb0fa8745f88a80d914df09f4ff6 (patch) | |
| tree | 541d210853ea79be92d280833d4f8fbb199e2dad /src/main/res | |
| parent | f09d35e55ad3519436521558f6795559b2a385a3 (diff) | |
complete backup importer
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index f5226722e..e9e8d95b2 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -610,5 +610,8 @@ <string name="registration_please_wait">Registrierung fehlgeschlagen: Bitte später versuchen</string> <string name="send_message_to_x">Nachricht an %s senden</string> <string name="joining_conference">Konferenz beitreten…</string> + <string name="import_database">Backup importieren</string> + <string name="import_text">Es wurde ein Backup gefunden, welches importiert werden kann.\nMöglicherweise wirst du gefragt, ob du eine ältere Version oder Conversations deinstallieren möchtest und dein Messenger startet während des Importvorgangs neu. Soll das Backup importiert werden?</string> + <string name="uninstall_app_text">Es ist eine alte Version von Pix-Art Messenger oder Conversations installiert. Falls du einen alten Pix-Art Messenger installiert hast, solltest du diesen deinstallieren. Nach der Deinstallation, solltest du erneut auf \'Backup importieren\' klicken, damit deine Daten in die neue Version importiert werden.</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b71122003..aec0e3a43 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -642,8 +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. Shall the backup be imported?</string> - <string name="import_database">import backup</string> - <string name="import_failed">The import has failed</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> |