From 198e2ded972b153f3b96e2c7af2982c7a76cf0b8 Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Thu, 21 Apr 2016 21:07:01 +0200
Subject: changed and added some strings

---
 src/main/res/values-de/strings.xml | 12 +++++++++---
 src/main/res/values/strings.xml    | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 437d660df..de5a67c58 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -166,7 +166,7 @@
   <string name="attach_record_voice">Sprache aufzeichnen</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Passwort</string>
-  <string name="account_settings_example_jabber_id">benutzer@domain.de</string>
+  <string name="account_settings_example_jabber_id">benutzer@pix-art.de</string>
   <string name="account_settings_confirm_password">Passwort bestätigen</string>
   <string name="password">Passwort</string>
   <string name="confirm_password">Passwort bestätigen</string>
@@ -232,7 +232,7 @@
   <string name="contact_already_exists">Der Kontakt existiert bereits</string>
   <string name="join">Beitreten</string>
   <string name="conference_address">Konferenz-Adresse</string>
-  <string name="conference_address_example">raum@conference.domain.de</string>
+  <string name="conference_address_example">raum@room.pix-art.de</string>
   <string name="save_as_bookmark">Zur Kontaktliste hinzufügen</string>
   <string name="delete_bookmark">Von Kontaktliste entfernen</string>
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
@@ -512,7 +512,7 @@
   <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Gerät lautlos ist</string>
   <string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
   <string name="pref_treat_vibrate_as_silent_summary">Setzt deinen Status auf \"nicht verfügbar\", solange das Gerät auf Vibration geschaltet ist</string>
-  <string name="hostname_example">xmpp.domain.de</string>
+  <string name="hostname_example">xmpp.pix-art.de</string>
   <string name="action_add_account_with_certificate">Konto mit Zertifikat hinzufügen</string>
   <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string>
   <string name="authenticate_with_certificate">Leer lassen, um mit Zertifikat anzumelden</string>
@@ -617,4 +617,10 @@
   <string name="pref_return_to_previous">Schnell-Teilen</string>
   <string name="pref_return_to_previous_summary">Nach dem teilen sofort wieder zur letzten App zurückkehren anstatt die Unterhalt zu öffnen</string>
   <string name="shared_text_with_x">Text mit %s geteilt</string>
+  <string name="create_account">Konto erstellen</string>
+  <string name="magic_create_text">Wir erstellen nun mit dir gemeinsam ein Konto auf pix-art.de.\nDanach kannst du mit Kontakten auf diesem und anderen Servern in Kontakt treten, indem du ihnen deine Jabber-ID gibst.</string>
+  <string name="pick_your_username">Wähle deinen Benutzernamen</string>
+  <string name="use_existing_accout">Nutze ein bestehendes Konto</string>
+  <string name="welcome_text">...ist ein kostenfreier und sicherer XMPP/Jabber Client für die Benutzung mit pix-art.de</string>
+  <string name="your_full_jid_will_be">Deine Jabber-ID lautet: %s</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 446eddb24..8a5214783 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -173,7 +173,7 @@
 	<string name="attach_record_voice">Record voice</string>
 	<string name="account_settings_jabber_id">Jabber ID</string>
 	<string name="account_settings_password">Password</string>
-	<string name="account_settings_example_jabber_id">username@example.com</string>
+	<string name="account_settings_example_jabber_id">username@pix-art.de</string>
 	<string name="account_settings_confirm_password">Confirm password</string>
 	<string name="password">Password</string>
 	<string name="confirm_password">Confirm password</string>
@@ -241,7 +241,7 @@
 	<string name="contact_already_exists">The contact already exists</string>
 	<string name="join">Join</string>
 	<string name="conference_address">Conference address</string>
-	<string name="conference_address_example">room@conference.example.com</string>
+	<string name="conference_address_example">conference@room.pix-art.de</string>
 	<string name="save_as_bookmark">Save as bookmark</string>
 	<string name="delete_bookmark">Delete bookmark</string>
 	<string name="bookmark_already_exists">This bookmark already exists</string>
@@ -565,7 +565,7 @@
 	<string name="pref_treat_vibrate_as_silent_summary">Marks your resource as not available when device is on vibrate</string>
 	<string name="pref_show_connection_options">Extended connection settings</string>
 	<string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string>
-	<string name="hostname_example">xmpp.example.com</string>
+	<string name="hostname_example">xmpp.pix-art.de</string>
 	<string name="action_add_account_with_certificate">Add account with certificate</string>
 	<string name="unable_to_parse_certificate">Unable to parse certificate</string>
 	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
@@ -647,11 +647,11 @@
 	<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">Pix-Art Messenger</string>
-	<string name="welcome_text">XMPP is a provider independent protocol. You can use this client with pix-art.de</string>
-	<string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de.\nYou will be able to communicate with users of other providers by giving them your full Jabber ID.</string>
-	<string name="your_full_jid_will_be">Your full Jabber ID will be: %s</string>
-	<string name="create_account">Create Account</string>
-	<string name="use_own_provider">Use my own provider</string>
-	<string name="pick_your_username">Pick your username</string>
+	<string name="welcome_header" translatable="false">Pix-Art Messenger</string>
+	<string name="welcome_text">...is a free and secure XMPP/Jabber client for the use with pix-art.de</string>
+	<string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de.\nYou 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>
+	<string name="create_account">Create account</string>
+	<string name="use_existing_accout">Use an existing account</string>
+	<string name="pick_your_username">Choose your username</string>
 </resources>
-- 
cgit v1.2.3