From 16eb1bfbd0a11d53380d043bf1f62feb7a6b6f22 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 4 May 2016 13:19:07 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-de/strings.xml     |  2 +-
 src/main/res/values-ro-rRO/strings.xml |  2 ++
 src/main/res/values-sv/strings.xml     | 17 +++++++++++++++++
 src/main/res/values/strings.xml        |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ca5601660831fe17a9fbb17b67a6c1da6cc3f305..75232530be19e2e53609e3482ec9b6d4dc52c6fd 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -105,7 +105,7 @@
   <string name="pref_accept_files_summary">Dateien automatisch annehmen, die kleiner sind als …</string>
   <string name="pref_attachments">Anhänge</string>
   <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="pref_return_to_previous_summary">Nach dem Teilen sofort wieder zur vorherigen App zurückkehren anstatt die Unterhaltung zu öffnen</string>
   <string name="pref_notification_settings">Benachrichtigung</string>
   <string name="pref_notifications">Benachrichtigungen</string>
   <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 13420bda3112d284e05a682e8022fe5573b506fb..7ee2f0b9cef4254e7ac13a17b924e0d955d94c5b 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -590,6 +590,8 @@ Emitent</string>
   <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fisier invalid</string>
   <string name="no_application_to_share_uri">Nu s-a gasit nici o aplicatie care sa partajeze URI</string>
   <string name="share_uri_with">Partajeaza URI cu...</string>
+  <string name="welcome_text">XMPP este un protocol independent ce nu depinde de un anume furnizor. Aveți posibilitatea sa utilizati acest client cu orice server XMPP doriti.\nTotusi pentru confortul dumneavoastra am facilitat crearea unui cont pe conversations.im; un furnizor potrivit pentru utilizarea cu aplicatia Conversations.</string>
+  <string name="magic_create_text">Va vom ghida prin procesul de creare al unui cont pe conversations.im.\nCand alegeti conversations.im ca furnizor veti putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastra Jabber.</string>
   <string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string>
   <string name="create_account">Creeaza cont</string>
   <string name="use_own_provider">Foloseste furnizorul meu</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 57f44999e9d071e938a664fe242959f8ffe703e0..fd6a9a9ba8fe6a4104a004b664e3758c8caf2354 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -586,4 +586,21 @@
   <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string>
   <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string>
   <string name="share_uri_with">Dela URI med...</string>
+  <string name="welcome_text">XMPP är ett leverantörsoberoende protokoll. Du kan använda denna klient med vilken XMPP server du vill.\nFör din bekvämlighet har vi gjort det enkelt att skapa ett konto hos conversations.im; en leverantör speciellt anpassad för att användas med Conversations.</string>
+  <string name="magic_create_text">Du kommer nu att få hjälp med att skapa ett konto på conversations.im.\nNär conversations.im väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID.</string>
+  <string name="your_full_jid_will_be">Ditt jabber ID blir: %s</string>
+  <string name="create_account">Skapa konto</string>
+  <string name="use_own_provider">Använd min egen leverantör</string>
+  <string name="pick_your_username">Välj användarnamn</string>
+  <string name="pref_manually_change_presence">Ändra tillgänglighet manuellt</string>
+  <string name="pref_manually_change_presence_summary">Tryck på din avatarbild för att ändra tillgänglighet</string>
+  <string name="change_presence">Ändra tillgänglighet</string>
+  <string name="status_message">Statusmeddelande</string>
+  <string name="all_accounts_on_this_device">Använd för alla konton på den här enheten</string>
+  <string name="presence_chat">Tillgänglig</string>
+  <string name="presence_online">Online</string>
+  <string name="presence_away">Borta</string>
+  <string name="presence_xa">Ej tillgänglig</string>
+  <string name="presence_dnd">Upptagen</string>
+  <string name="secure_password_generated">Ett säkert lösenord har genererats</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ae5c704c181a30fa656bb02a36ffa8e58047e33c..f168b52f6039bc22b0d5b7a51bb2d7f1b4b5a458 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -617,7 +617,7 @@
 	<string name="security_error_invalid_file_access">Security error: Invalid file access</string>
 	<string name="no_application_to_share_uri">No application found to share URI</string>
 	<string name="share_uri_with">Share URI with…</string>
-	<string translatable="false" name="welcome_header">Start your Conversations</string>
+	<string translatable="false" name="welcome_header">Join the Conversation</string>
 	<string name="welcome_text">XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations.</string>
 	<string name="magic_create_text">We will guide you through the process of creating an account on conversations.im.\nWhen picking conversations.im as a provider you 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>