From 24ea66c9fcc374ea9b5f0b0057f244b21f6fef99 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 1 Jun 2016 00:12:14 +0200
Subject: display invite again menu item for offline members

---
 src/main/res/menu/muc_details_context.xml | 4 ++++
 src/main/res/values/strings.xml           | 1 +
 2 files changed, 5 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index af5e691b7..9e9eb8a16 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -8,6 +8,10 @@
         android:id="@+id/action_contact_details"
         android:title="@string/action_contact_details"
         android:visible="false"/>
+    <item
+        android:id="@+id/invite"
+        android:title="@string/invite_again"
+        android:visible="false"/>
     <item
         android:id="@+id/send_private_message"
         android:title="@string/send_private_message"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0739d0eb2..2decae45c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -648,4 +648,5 @@
 	<string name="conference_subject">Subject</string>
 	<string name="choose_participants">Choose participants</string>
 	<string name="creating_conference">Creating conference…</string>
+	<string name="invite_again">Invite again</string>
 </resources>
-- 
cgit v1.2.3


From 20ba1add1eaeb43a522189a85471ac3c4e1a3933 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 1 Jun 2016 11:38:57 +0200
Subject: pulled translation from transifex

---
 src/main/res/values-nl/strings.xml | 8 ++++++++
 src/main/res/values-sv/strings.xml | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a55ab1298..8b186a223 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Dit gesprek na afloop beëindigen</string>
   <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
+  <string name="send_message_to_x">Bericht sturen naar %s</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
   <string name="send_omemo_x509_message">Verstuur v\\OMEMO-versleuteld bericht</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
   <string name="you">Jij</string>
   <string name="action_edit_subject">Onderwerp van groepsgesprek bewerken</string>
+  <string name="edit_subject_hint">Het onderwerp van dit groepsgesprek</string>
   <string name="joining_conference">Deelnemen aan groepsgesprek…</string>
   <string name="leave">Verlaten</string>
   <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
@@ -607,4 +609,10 @@
   <string name="secure_password_generated">Een veilig wachtwoord is aangemaakt</string>
   <string name="device_does_not_support_battery_op">Je apparaat ondersteunt het uitschakelen van batterij-optimalisatie niet</string>
   <string name="show_password">Wachtwoord weergeven</string>
+  <string name="registration_please_wait">Registratie mislukt: probeer later opnieuw</string>
+  <string name="create_conference">Groepsgesprek aanmaken</string>
+  <string name="join_or_create_conference">Deelnemen aan groepsgesprek of een aanmaken</string>
+  <string name="conference_subject">Onderwerp</string>
+  <string name="choose_participants">Kies deelnemers</string>
+  <string name="creating_conference">Aanmaken van groepsgesprek…</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 0688d97b2..d58ad27e8 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Avsluta denna konversation efteråt</string>
   <string name="choose_presence">Välj tillgänglighet till kontakt</string>
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
+  <string name="send_message_to_x">Skicka meddelande till %s</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
   <string name="send_omemo_x509_message">Skicka v\\OMEMO-krypterat meddelande</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
   <string name="you">Du</string>
   <string name="action_edit_subject">Ändra konferensämne</string>
+  <string name="edit_subject_hint">Ämnet för denna konferens</string>
   <string name="joining_conference">Går med i konferens...</string>
   <string name="leave">Lämna</string>
   <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
@@ -607,4 +609,10 @@
   <string name="secure_password_generated">Ett säkert lösenord har genererats</string>
   <string name="device_does_not_support_battery_op">Din enhet stödjer inte deaktivering av batterioptimeringar</string>
   <string name="show_password">Visa lösenord</string>
+  <string name="registration_please_wait">Registreringfel: Försök igen senare</string>
+  <string name="create_conference">Skapa konferens</string>
+  <string name="join_or_create_conference">Gå med i eller skapa konferens</string>
+  <string name="conference_subject">Ämne</string>
+  <string name="choose_participants">Välj deltagare</string>
+  <string name="creating_conference">Skapar konferens...</string>
 </resources>
-- 
cgit v1.2.3