From 6e67db7631048cf392bbfc19617a62a4a4acd50b Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Sat, 15 Jul 2017 03:56:22 -0400
Subject: [PATCH] Release 1.1.4-beta.5

---
 app/build.gradle                       | 4 ++--
 app/proguard-rules.pro                 | 5 ++++-
 app/src/main/res/values-ar/strings.xml | 6 +-----
 app/src/main/res/values-de/strings.xml | 6 +-----
 app/src/main/res/values-fr/strings.xml | 6 +-----
 app/src/main/res/values-ja/strings.xml | 6 +-----
 app/src/main/res/values-pl/strings.xml | 2 --
 app/src/main/res/values-tr/strings.xml | 6 +-----
 8 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 91c75b630..f6eeb14fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 20
-        versionName "1.1.4-beta.4"
+        versionCode 21
+        versionName "1.1.4-beta.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index b5aa32e86..f59f1c04a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -56,4 +56,7 @@
 # for jsoup
 -keep public class org.jsoup.** {
 public *;
-}
\ No newline at end of file
+}
+
+# for bouncycastle
+-dontwarn org.bouncycastle.**
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 90a13b9b1..262d9137c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -41,9 +41,6 @@
     <string name="status_content_warning_show_more">اعرض أكثر</string>
     <string name="status_content_warning_show_less">اعرض أقل</string>
 
-    <string name="footer_end_of_statuses">نهاية الحالات</string>
-    <string name="footer_end_of_notifications">نهاية الاشعارات</string>
-    <string name="footer_end_of_accounts">نهاية الحسابات</string>
     <string name="footer_empty">لا توجد تبويقات هنا بعد. اسحب للأسفل للتحديث !</string>
 
     <string name="notification_reblog_format">%s عزز تبويقك</string>
@@ -102,8 +99,6 @@
     <string name="send_status_link_to">شارك رابط التبويق على ...</string>
     <string name="send_status_content_to">شارك التبويق على …</string>
 
-    <string name="search">ابحث عن حسابات ...</string>
-
     <string name="confirmation_send">بَوِّق</string>
     <string name="confirmation_reported">تم الإرسال !</string>
     <string name="confirmation_unblocked">تم فك الحجب عن الحساب</string>
@@ -114,6 +109,7 @@
     <string name="hint_content_warning">تحذير عن المحتوى</string>
     <string name="hint_display_name">الإسم العلني</string>
     <string name="hint_note">السيرة</string>
+    <string name="hint_search">ابحث عن حسابات ...</string>
 
     <string name="label_avatar">الصورة الرمزية</string>
     <string name="label_header">رأس الصفحة</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e7592b75c..0cfee448b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -38,9 +38,6 @@
     <string name="status_content_warning_show_more">Zeige mehr</string>
     <string name="status_content_warning_show_less">Zeige weniger</string>
 
-    <string name="footer_end_of_statuses">Ende des Beitrages</string>
-    <string name="footer_end_of_notifications">Ende der Benachrichtigungen</string>
-    <string name="footer_end_of_accounts">Ende der Accounts</string>
     <!-- <string name="footer_empty">There are no toots here so far. Pull down to refresh!</string> -->
 
     <string name="notification_reblog_format">%s teilte deinen Beitrag</string>
@@ -95,8 +92,6 @@
     <string name="send_status_link_to">Toot-Link teilen</string>
     <!-- <string name="send_status_content_to">Share toot to…</string> -->
 
-    <string name="search">Suche Accounts…</string>
-
     <string name="confirmation_send">Toot!</string>
     <string name="confirmation_reported">Gesendet!</string>
 
@@ -105,6 +100,7 @@
     <string name="hint_content_warning">Inhaltswarnung</string>
     <!-- <string name="hint_display_name">Display name</string> -->
     <!-- <string name="hint_note">Bio</string> -->
+    <string name="hint_search">Suche Accounts…</string>
 
     <!-- <string name="label_avatar">Avatar</string> -->
     <!-- <string name="label_header">Header</string> -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index aaaba70bd..34424ac6e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -40,9 +40,6 @@
     <string name="status_content_warning_show_more">Voir plus</string>
     <string name="status_content_warning_show_less">Voir moins</string>
 
-    <string name="footer_end_of_statuses">Fin du pouet</string>
-    <string name="footer_end_of_notifications">Fin des notifications</string>
-    <string name="footer_end_of_accounts">Fin des comptes</string>
     <string name="footer_empty">Il n’y a aucun pouet pour le moment.\nGlissez vers le bas pour actualiser !</string>
 
     <string name="notification_reblog_format">%s a boosté votre pouet.</string>
@@ -103,8 +100,6 @@
     <string name="send_status_link_to">Partager l’URL de votre pouet avec…</string>
     <string name="send_status_content_to">Partager le pouet avec…</string>
 
-    <string name="search">Rechercher un compte…</string>
-
     <string name="confirmation_send">Pouet !</string>
     <string name="confirmation_reported">Envoyé !</string>
 
@@ -113,6 +108,7 @@
     <string name="hint_content_warning">Contenu sensible</string>
     <string name="hint_display_name">Afficher le nom</string>
     <string name="hint_note">Bio</string>
+    <string name="hint_search">Rechercher un compte…</string>
 
     <string name="label_avatar">Avatar</string>
     <string name="label_header">En-tête</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 86068f0cd..e6cf278ff 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -41,9 +41,6 @@
     <string name="status_content_warning_show_more">続きを表示</string>
     <string name="status_content_warning_show_less">続きを隠す</string>
 
-    <string name="footer_end_of_statuses">これ以降に投稿はありません</string>
-    <string name="footer_end_of_notifications">これ以降に通知はありません</string>
-    <string name="footer_end_of_accounts">これ以降にアカウントはありません</string>
     <string name="footer_empty">現在トゥートはありません。更新するにはプルダウンしてください！</string>
 
     <string name="notification_reblog_format">%sさんがトゥートをブーストしました</string>
@@ -105,8 +102,6 @@
     <string name="send_status_link_to">トゥートのURLを共有…</string>
     <string name="send_status_content_to">トゥートを共有…</string>
 
-    <string name="search">ユーザーを検索…</string>
-
     <string name="confirmation_send">トゥート！</string>
     <string name="confirmation_reported">送信しました！</string>
     <string name="confirmation_unblocked">ブロックを解除しました</string>
@@ -117,6 +112,7 @@
     <string name="hint_content_warning">注意書き</string>
     <string name="hint_display_name">表示名</string>
     <string name="hint_note">プロフィール</string>
+    <string name="hint_search">ユーザーを検索…</string>
 
     <string name="label_avatar">アイコン</string>
     <string name="label_header">ヘッダー</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7d1a13161..9f5959608 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -104,8 +104,6 @@
     <string name="send_status_link_to">Udostępnij link do wpisu do…</string>
     <string name="send_status_content_to">Udostępnij wpis do…</string>
 
-    <string name="search">Szukaj konta…</string>
-
     <string name="confirmation_send">Wyślij!</string>
     <string name="confirmation_reported">Wyślij!</string>
     <string name="confirmation_unblocked">Odblokowano użytkownika</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f5ae2096a..dbd2973f2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -41,9 +41,6 @@
     <string name="status_content_warning_show_more">Daha Fazla Göster</string>
     <string name="status_content_warning_show_less">Daha Az Göster</string>
 
-    <string name="footer_end_of_statuses">iletilerin sonu</string>
-    <string name="footer_end_of_notifications">bildirmelerin sonu</string>
-    <string name="footer_end_of_accounts">hesapların sonu</string>
     <string name="footer_empty">Henüz hiç ileti yoktur. Yenilemek için aşağıya çek!</string>
 
     <string name="notification_reblog_format">%s iletini yükseltti</string>
@@ -103,8 +100,6 @@
     <string name="send_status_link_to">İletinin adresini paylaş…</string>
     <string name="send_status_content_to">İletiyi paylaş…</string>
 
-    <string name="search">Hesaplarda ara…</string>
-
     <string name="confirmation_send">İlet!</string>
     <string name="confirmation_reported">İletildi!</string>
 
@@ -113,6 +108,7 @@
     <string name="hint_content_warning">İçerik uyarı</string>
     <string name="hint_display_name">Görünen ad</string>
     <string name="hint_note">Biyo</string>
+    <string name="hint_search">Hesaplarda ara…</string>
 
     <string name="label_avatar">Simge</string>
     <string name="label_header">Üstlük</string>