aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-10-17 20:49:02 +0200
committerChristian Schneppe <christian@pix-art.de>2017-10-17 20:49:02 +0200
commitcfa5d01e0519ae8aff6a87c2165cb36e1e048262 (patch)
tree04fd3ab7efa0edd6287e9892a42a043cc90b9822
parent9a3d8a556ad7ded2babf2dc825eeb438a225a2ea (diff)
move more untranslatable strings to defaults.xml
-rw-r--r--src/main/res/values/defaults.xml6
-rw-r--r--src/main/res/values/strings.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 4dc421542..3bb1b2284 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Pix-Art Messenger</string>
+ <string name="welcome_header" translatable="false">Pix-Art Messenger</string>
+ <string name="type_pc" translatable="false">Computer</string>
+ <string name="type_phone" translatable="false">Mobile phone</string>
+ <string name="type_tablet" translatable="false">Tablet</string>
+ <string name="type_web" translatable="false">Web browser</string>
+ <string name="type_console" translatable="false">Console</string>
<string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b>
\n\nCopyright © 2014-2017 Christian Schneppe
\n\nhttp://jabber.pix-art.de
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index eb3dc08a7..3e448d1c0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -560,7 +560,6 @@
<string name="no_application_to_share_uri">No application found to share URI</string>
<string name="share_uri_with">Share URI with…</string>
<string name="mgmt_account_reconnect">Reconnect</string>
- <string name="welcome_header" translatable="false">Pix-Art Messenger</string>
<string name="welcome_text">…is a free and secure XMPP/Jabber client.</string>
<string name="magic_create_text">We will guide you through the process of creating an account with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
<string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
@@ -607,11 +606,6 @@
<string name="no_permission">Pix-Art Messenger has no permissions</string>
<string name="send_image">Send image?</string>
<string name="this_device_is_no_longer_in_use">This device is no longer in use</string>
- <string name="type_pc" translatable="false">Computer</string>
- <string name="type_phone" translatable="false">Mobile phone</string>
- <string name="type_tablet" translatable="false">Tablet</string>
- <string name="type_web" translatable="false">Web browser</string>
- <string name="type_console" translatable="false">Console</string>
<string name="import_canceled">Import canceled</string>
<string name="Import_failed">Database import failed, an import is not possible</string>
<string name="Password_wrong">Wrong password, try again</string>