From 46574d6e111a46790656d52476dc2a092c8b9109 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 23 Jul 2018 20:43:42 +0200
Subject: [PATCH] version bump to 2.2.8 + changelog

---
 CHANGELOG.md                           | 3 +++
 build.gradle                           | 4 ++--
 src/main/res/values-fr/strings.xml     | 5 +++++
 src/main/res/values-it/strings.xml     | 1 +
 src/main/res/values-zh-rCN/strings.xml | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e1f20db5..f74b6fd4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 2.2.8
+* fixed regression that broke XMPP uris
+
 ### Version 2.2.7
 * stability improvements
 
diff --git a/build.gradle b/build.gradle
index c5ab5d711..1044150fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 279
-        versionName "2.2.7"
+        versionCode 280
+        versionName "2.2.8"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index fb7b16256..8c57a5251 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Partager avec Conversation</string>
   <string name="title_activity_start_conversation">Démarrer une conversation</string>
   <string name="title_activity_choose_contact">Choisir un contact</string>
+  <string name="title_activity_choose_contacts">Choisir les contacts</string>
   <string name="title_activity_share_via_account">Partager via le compte</string>
   <string name="title_activity_block_list">Bloquer la liste</string>
   <string name="just_now">À l\'instant</string>
@@ -236,6 +237,7 @@
   <string name="contact_has_read_up_to_this_point">%s a tout lu jusqu\'ici</string>
   <string name="contacts_have_read_up_to_this_point">%s a tout lu jusqu\'ici</string>
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s+%2$d et plus  ont tout lu jusqu\'ici</string>
+  <string name="everyone_has_read_up_to_this_point">Tout le monde a lu jusqu\'ici</string>
   <string name="publish">Publier</string>
   <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
   <string name="publishing">Mise à jour…</string>
@@ -715,4 +717,7 @@
   <string name="contact_name">Nom du contact</string>
   <string name="nickname">Surnom</string>
   <string name="group_chat_name">Nom</string>
+  <string name="providing_a_name_is_optional">Fournir un nom est facultatif</string>
+  <string name="create_dialog_group_chat_name">Nom de la conversation de groupe</string>
+  <string name="conference_destroyed">Cette conversation de groupe a été supprimée</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7c990b736..4d6851670 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -719,4 +719,5 @@
   <string name="group_chat_name">Nome</string>
   <string name="providing_a_name_is_optional">Il nome è facoltativo</string>
   <string name="create_dialog_group_chat_name">Nome chat di gruppo</string>
+  <string name="conference_destroyed">Questa chat di gruppo è stata distrutta</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 41c630e64..875fc30c9 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -284,6 +284,7 @@
   <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
   <string name="conference_banned">你已经被禁言了</string>
   <string name="conference_members_only">这个群组只允许群组成员聊天</string>
+  <string name="conference_resource_constraint">资源限制</string>
   <string name="conference_kicked">您已被移出该群组了</string>
   <string name="conference_shutdown">这个群组已被关闭</string>
   <string name="conference_unknown_error">您已不在该群组</string>
@@ -713,4 +714,5 @@
   <string name="group_chat_name">名称</string>
   <string name="providing_a_name_is_optional">提供名称是可选的</string>
   <string name="create_dialog_group_chat_name">群聊名称</string>
+  <string name="conference_destroyed">群聊已被解散</string>
 </resources>