From 9b6ca7ff42f9af5a3f1df2fe5478adf08181801e Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sat, 3 Feb 2018 23:43:06 +0100
Subject: [PATCH] remove unused resources

---
 .../com/keylesspalace/tusky/BaseActivity.java |   1 -
 .../com/keylesspalace/tusky/LoginActivity.kt  |   1 -
 .../tusky/fragment/PreferencesFragment.java   |  62 +++++++-----------
 .../res/drawable-xxhdpi/ic_reblog_dark_.png   | Bin 1343 -> 0 bytes
 app/src/main/res/values-ca/strings.xml        |   8 ---
 app/src/main/res/values-de/strings.xml        |   7 --
 app/src/main/res/values-fr/strings.xml        |   8 ---
 app/src/main/res/values-hu/strings.xml        |   8 ---
 app/src/main/res/values-ja/strings.xml        |   8 ---
 app/src/main/res/values-nl/strings.xml        |   8 ---
 app/src/main/res/values-pl/strings.xml        |   8 ---
 app/src/main/res/values-pt-rBR/strings.xml    |   8 ---
 app/src/main/res/values-ru/strings.xml        |   8 ---
 app/src/main/res/values-tr/strings.xml        |   7 --
 app/src/main/res/values/strings.xml           |   8 ---
 15 files changed, 25 insertions(+), 125 deletions(-)
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_reblog_dark_.png

diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
index 04f2f646a..5af788df1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
@@ -38,7 +38,6 @@ import com.keylesspalace.tusky.json.SpannedTypeAdapter;
 import com.keylesspalace.tusky.network.AuthInterceptor;
 import com.keylesspalace.tusky.network.MastodonApi;
 import com.keylesspalace.tusky.util.OkHttpUtils;
-import com.keylesspalace.tusky.util.ResourcesUtils;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import okhttp3.Dispatcher;
diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
index e668b56f1..fb303a521 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
@@ -36,7 +36,6 @@ import com.keylesspalace.tusky.entity.AppCredentials
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.CustomTabsHelper
 import com.keylesspalace.tusky.util.OkHttpUtils
-import com.keylesspalace.tusky.util.ResourcesUtils
 import com.keylesspalace.tusky.util.ThemeUtils
 import kotlinx.android.synthetic.main.activity_login.*
 import retrofit2.Call
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/PreferencesFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/PreferencesFragment.java
index 7103c5e1d..3b5cd1a67 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/PreferencesFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/PreferencesFragment.java
@@ -70,62 +70,50 @@ public class PreferencesFragment extends PreferenceFragment implements SharedPre
             //on Android O and newer, launch the system notification settings instead of the app settings
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 
-                notificationPreferences.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        Intent intent = new Intent();
-                        intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+                notificationPreferences.setOnPreferenceClickListener(pref -> {
+                    Intent intent = new Intent();
+                    intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
 
-                        intent.putExtra("android.provider.extra.APP_PACKAGE", BuildConfig.APPLICATION_ID);
+                    intent.putExtra("android.provider.extra.APP_PACKAGE", BuildConfig.APPLICATION_ID);
 
-                        startActivity(intent);
-                        return true;
-                    }
+                    startActivity(intent);
+                    return true;
                 });
 
             } else {
-                notificationPreferences.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        PreferencesActivity activity = (PreferencesActivity) getActivity();
-                        if (activity != null) {
-                            activity.showFragment(R.xml.notification_preferences, R.string.pref_title_edit_notification_settings);
-                        }
-
-                        return true;
+                notificationPreferences.setOnPreferenceClickListener(pref -> {
+                    PreferencesActivity activity = (PreferencesActivity) getActivity();
+                    if (activity != null) {
+                        activity.showFragment(R.xml.notification_preferences, R.string.pref_title_edit_notification_settings);
                     }
+
+                    return true;
                 });
             }
         }
 
         Preference timelineFilterPreferences  = findPreference("timelineFilterPreferences");
         if(timelineFilterPreferences != null) {
-            timelineFilterPreferences.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    PreferencesActivity activity = (PreferencesActivity) getActivity();
-                    if (activity != null) {
-                        activity.showFragment(R.xml.timeline_filter_preferences, R.string.pref_title_status_tabs);
-                    }
-
-                    return true;
+            timelineFilterPreferences.setOnPreferenceClickListener(pref -> {
+                PreferencesActivity activity = (PreferencesActivity) getActivity();
+                if (activity != null) {
+                    activity.showFragment(R.xml.timeline_filter_preferences, R.string.pref_title_status_tabs);
                 }
+
+                return true;
             });
         }
 
         Preference httpProxyPreferences  = findPreference("httpProxyPreferences");
         if(httpProxyPreferences != null) {
-            httpProxyPreferences.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    PreferencesActivity activity = (PreferencesActivity) getActivity();
-                    if (activity != null) {
-                        pendingRestart = false;
-                        activity.showFragment(R.xml.http_proxy_preferences, R.string.pref_title_http_proxy_settings);
-                    }
-
-                    return true;
+            httpProxyPreferences.setOnPreferenceClickListener(pref -> {
+                PreferencesActivity activity = (PreferencesActivity) getActivity();
+                if (activity != null) {
+                    pendingRestart = false;
+                    activity.showFragment(R.xml.http_proxy_preferences, R.string.pref_title_http_proxy_settings);
                 }
+
+                return true;
             });
         }
 
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reblog_dark_.png b/app/src/main/res/drawable-xxhdpi/ic_reblog_dark_.png
deleted file mode 100644
index cf90f68879d69de6db5d2d8bca4ad30bfcaeb302..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1343
zcmV-F1;F}=P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000FBNkl<Zc-rk;
zd5BI?6#s^?H-yMG_BA9*nX&w#VTMs8vJ?`s4cTfa3>sO6MkH&NY}pM;O^uO1rjYDQ
z_MwTvXpC(b<2t9#)a$wTZQr}|-8<f|et*sPopbK*yYDXNoHwCRfB*pk1o*$f7>fqh
z2G#;r3j|@TF>n^}H1HYl8?YQ$2K)fr4(#|p3ey0X0sPAT#a-Y$U^BsYs{`8ryH-_k
z;(_@bVeSKyfl&_a^aSnz_O43ei~;^I3G)Y-iR+FBd#!-4fT>P}Rau;oz+WbDaJ`uu
zrroh*YopHM^bxE#%YCqoYtkFCH$m40`8h|NbACM*VCM+gd<(3rn?MIR;^4Z`$VVUR
z4YnuiBu*kN!bbcC4)WR0MuYuhx`>0P;U}Egvq6Hd!v_2JbP;GVN1TUvm5|`;zQIR<
z4&pQf7IC)pK@xnmAlntl*Fm6k&g?lT$ybWW&ovz`pr1`ae*w0X;42Dv%j9dn>H@9i
z%$~K9d=2LKnxV2d^?)Bu0po0HEXm&$&b_X+$^y;i{GyvB`AX*a%2QdKDARUZv2%5h
z;0v>kk2wNOS6QF|oPcvA`AXyXdXJB|$^z}>1U*xNpI*S9GBN|QuN9v-k5{aON9&GY
z_S9EdpkbV#pGxqvmGP0H`q^hYC+Ooo`xwi~3^1Be(W(o?yS1nLXumtKgyREKC;e3y
zr@7#lP4UToBf$@V*rvn9bc7)I=|0%5iAM#2{ijNA>xMz33I;I8hlA%nfo*)W2I`U+
z+a(ypsxa-YWMX87bO8jLB^bofFl>$!tZRrDT0B~Y!CV#$<he(CJt%*~1B#Xy(g_f7
zuEk)wxwKUWlkOIe)`^gAfS@m03@F{DtxXoTz60CpD9~<;K@~c!bW(Y`%)*wQwRZ@7
z5wk|B!!146!UnEMO>`BgpN&8zcDH)?`w$x&TRg@V9r0E^3gVs30JE_R!@@?k#dmSB
z@8Th@zQF6iX)4U33}%njg70=P75-Q_buRdPJFLMOY+}bpgGdV$OS=rSnF*6P-(70+
zy)=h0pwK&kr5qa>D$Jra4rb9Ws@d0YaL}wkl7&xfo*D`~L-#WgP_)h}q+M??XTXZY
zRA3CS*ygicIHJT+%gZa~92Y!fNo&e@)Ly#?y2Qa}uzEV2vIb|Vf7&aO9F8NA*03AC
z&pa^L3HXw!2W(W2cbL5_GM&Mu`PxNGS;ni12!kb}4Nfuu@R|08hR}cRfqu3PR-BJk
z2zHgq0PdO>oL-o5trIl38}Z2ZgD1W+0K8Pm;^ew%*22U;)z<8=PUbF`1biS-lrq}x
z<6Xprcfc7AXL*72;v^;E7jjx;!of>AgSB-T3$_U!b>U}xWuBR0sCDk9%{4=mu)jm+
zpg6a?3(cDGG$WiMD`M}0;4cr{<04o*SWfg<CBaj7p35JkQ1oh6WzVR5mx1R{6IBfx
z+xSM%d_mKL9dLFJQzfsIU~``m0S|TOafhMg-2&<#Iz*d7c^K>43e}QtOPM-2pxk@2
zv`%bOK%6YQM>mopRl^i(1jRY!<?Y8v2(`qf${_<=ty04(ij+VpQ`x{9`xITPCQWJD
z|B)n4PL+5!pJr2@kHTP2_h{|kmgekoany2L<Uy2D%1S0z`G0*u7vF)vWx$ib+f<+X
zN)?u3$|7b{&3{zH%Rh<;S6zvUYJdO%0t8S8e*ssI!kVCwkwgFh002ovPDHLkV1ku#
Bhrj>;

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index a5ebbc496..19b0e6329 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -69,22 +69,16 @@
     <string name="action_send">TOOT</string>
     <string name="action_send_public">TOOT!</string>
     <string name="action_retry">Torna a intentar-ho</string>
-    <string name="action_mark_sensitive">Marca-ho com a contingut sensible</string>
     <string name="action_hide_text">Amaga el text amb un avís</string>
-    <string name="action_ok">D\'acord</string>
-    <string name="action_cancel">Cancel·la</string>
     <string name="action_close">Tanca</string>
-    <string name="action_back">Enrere</string>
     <string name="action_view_profile">Perfil</string>
     <string name="action_view_preferences">Preferències</string>
     <string name="action_view_favourites">Preferits</string>
     <string name="action_view_mutes">Usuaris silenciats</string>
     <string name="action_view_blocks">Usuaris blocats</string>
     <string name="action_view_follow_requests">Peticions de seguiment</string>
-    <string name="action_view_thread">Fil</string>
     <string name="action_view_media">Multimèdia</string>
     <string name="action_open_in_web">Obre al navegador</string>
-    <string name="action_submit">Envia</string>
     <string name="action_photo_pick">Afegeix multimètida</string>
     <string name="action_photo_take">Fes una foto</string>
     <string name="action_share">Comparteix</string>
@@ -94,7 +88,6 @@
     <string name="action_hide_media">Amaga el multimèdia</string>
     <string name="action_compose_options">Opcions</string>
     <string name="action_open_drawer">Open drawer</string>
-    <string name="action_clear">Buida</string>
     <string name="action_save">Desa</string>
     <string name="action_edit_profile">Edita el perfil</string>
     <string name="action_undo">Desfés</string>
@@ -220,7 +213,6 @@
     <string name="description_account_locked">Compte blocat</string>
 
     <string name="about_title_activity">Quant a</string>
-    <string name="about_application_version">Versió: %s</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky és programari gratuït, lliure i de codi obert.
         Està llicenciat en els termes de la Llicència Pública General GNU versió 3.
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5d34e7c66..69f6cf8ba 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -63,20 +63,14 @@
     <string name="action_send">TRÖT</string>
     <string name="action_send_public">TRÖT!</string>
     <string name="action_retry">Erneut versuchen</string>
-    <string name="action_mark_sensitive">Markiere Mediendatei als heikel</string>
     <string name="action_hide_text">Verstecke Text hinter Warnung</string>
-    <string name="action_ok">Ok</string>
-    <string name="action_cancel">Abbrechen</string>
     <string name="action_close">Schließen</string>
-    <string name="action_back">Zurück</string>
     <string name="action_view_profile">Profil</string>
     <string name="action_view_preferences">Einstellungen</string>
     <string name="action_view_favourites">Favoriten</string>
     <string name="action_view_blocks">Blockierte Accounts</string>
-    <string name="action_view_thread">Thread</string>
     <string name="action_view_media">Medien</string>
     <string name="action_open_in_web">Im Browser öffnen</string>
-    <string name="action_submit">Senden</string>
     <string name="action_photo_pick">Füge Medien hinzu</string>
     <string name="action_photo_take">Foto machen</string>
     <string name="action_share">Teilen</string>
@@ -85,7 +79,6 @@
     <string name="action_mention">Erwähnen</string>
     <string name="action_compose_options">Einstellungen</string>
     <string name="action_open_drawer">Drawer öffnen</string>
-    <string name="action_clear">Löschen</string>
     <string name="action_search">Suche</string>
     <string name="action_access_saved_toot">Entwürfe</string>
     <string name="action_save">Speichern</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index dc1fa9d4f..cedd95321 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -66,20 +66,14 @@
     <string name="action_send">POUET</string>
     <string name="action_send_public">POUET !</string>
     <string name="action_retry">Réessayer</string>
-    <string name="action_mark_sensitive">Définir le média comme sensible.</string>
     <string name="action_hide_text">Masquer le texte par une mise en garde.</string>
-    <string name="action_ok">O.K.</string>
-    <string name="action_cancel">Annuler</string>
     <string name="action_close">Fermer</string>
-    <string name="action_back">Retour</string>
     <string name="action_view_profile">Profil</string>
     <string name="action_view_preferences">Préférences</string>
     <string name="action_view_favourites">Favoris</string>
     <string name="action_view_blocks">Utilisateurs bloqués</string>
-    <string name="action_view_thread">Fil</string>
     <string name="action_view_media">Média</string>
     <string name="action_open_in_web">Ouvrir dans votre navigateur</string>
-    <string name="action_submit">Envoyer</string>
     <string name="action_photo_pick">Ajouter un média</string>
     <string name="action_photo_take">Prendre une photo</string>
     <string name="action_share">Partager</string>
@@ -89,7 +83,6 @@
     <!--<string name="action_mark_sensitive">Mark media sensitive</string>-->
     <string name="action_compose_options">Options</string>
     <string name="action_open_drawer">Ouvrir le menu</string>
-    <string name="action_clear">Nettoyer</string>
     <string name="action_save">Sauvegarder</string>
     <string name="action_edit_profile">Modifier le profil</string>
     <string name="action_accept">Accepter</string>
@@ -173,7 +166,6 @@
     <string name="about_title_activity">À propos</string>
     <string name="about_project_site">Site du projet :          https://tusky.keylesspalace.com</string>
     <string name="about_bug_feature_request_site">Rapport de bugs &amp; demande de fonctionnalités :      https://github.com/Vavassor/Tusky/issues</string>
-    <string name="about_application_version">Version : %s</string>
 
 
     <string name="state_follow_requested">Demande effectuée</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e2dee4337..b1d80c656 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -66,22 +66,16 @@
     <string name="action_send">TÜLK</string>
     <string name="action_send_public">TÜLK!</string>
     <string name="action_retry">Próbálja újra</string>
-    <string name="action_mark_sensitive">Megjelöl mint kényes tartalom</string>
     <string name="action_hide_text">Szöveg figyelmeztetés mögé helyezése</string>
-    <string name="action_ok">Ok</string>
-    <string name="action_cancel">Mégse</string>
     <string name="action_close">Bezár</string>
-    <string name="action_back">Vissza</string>
     <string name="action_view_profile">Profil</string>
     <string name="action_view_preferences">Preferenciák</string>
     <string name="action_view_favourites">Kedvencek</string>
     <string name="action_view_mutes">Némított felhasználók</string>
     <string name="action_view_blocks">Blokkolt felhasználók</string>
     <string name="action_view_follow_requests">Követési kérések</string>
-    <string name="action_view_thread">Tülköléslánc</string>
     <string name="action_view_media">Média</string>
     <string name="action_open_in_web">Megnyitás böngészőben</string>
-    <string name="action_submit">Elküld</string>
     <string name="action_photo_pick">Média hozzácsatolása</string>
     <string name="action_photo_take">Kép készítése</string>
     <string name="action_share">Megoszt</string>
@@ -91,7 +85,6 @@
     <string name="action_hide_media">Média elrejtése</string>
     <string name="action_compose_options">Beállítások</string>
     <string name="action_open_drawer">Drawer megnyitása</string>
-    <string name="action_clear">Tisztázás</string>
     <string name="action_save">Mentés</string>
     <string name="action_edit_profile">Profil szerkesztése</string>
     <string name="action_undo">Visszacsinál</string>
@@ -190,7 +183,6 @@
     <string name="description_account_locked">Fiók lezárva</string>
 
     <string name="about_title_activity">Rólunk</string>
-    <string name="about_application_version">App verzió: %s</string>
     <string name="about_project_site">
         Projekt honlapja:\n
         https://tusky.keylesspalace.com
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 07ca80e5d..f5f73b189 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -67,22 +67,16 @@
     <string name="action_send">トゥート</string>
     <string name="action_send_public">トゥート！</string>
     <string name="action_retry">再試行</string>
-    <string name="action_mark_sensitive">閲覧注意としてマークする</string>
     <string name="action_hide_text">テキストを注意書きで隠す</string>
-    <string name="action_ok">OK</string>
-    <string name="action_cancel">キャンセル</string>
     <string name="action_close">閉じる</string>
-    <string name="action_back">戻る</string>
     <string name="action_view_profile">プロフィール</string>
     <string name="action_view_preferences">設定</string>
     <string name="action_view_favourites">お気に入り</string>
     <string name="action_view_mutes">ミュートしたユーザー</string>
     <string name="action_view_blocks">ブロックしたユーザー</string>
     <string name="action_view_follow_requests">フォローリクエスト</string>
-    <string name="action_view_thread">スレッド</string>
     <string name="action_view_media">メディア</string>
     <string name="action_open_in_web">ブラウザで開く</string>
-    <string name="action_submit">決定</string>
     <string name="action_photo_pick">メディアを追加</string>
     <string name="action_photo_take">写真を撮る</string>
     <string name="action_share">共有</string>
@@ -92,7 +86,6 @@
     <string name="action_hide_media">メディアを隠す</string>
     <string name="action_compose_options">オプション</string>
     <string name="action_open_drawer">メニューを開く</string>
-    <string name="action_clear">消去</string>
     <string name="action_save">保存</string>
     <string name="action_edit_profile">プロフィールを編集</string>
     <string name="action_undo">取り消す</string>
@@ -201,7 +194,6 @@
     <string name="description_account_locked">非公開アカウント</string>
 
     <string name="about_title_activity">このアプリについて</string>
-    <string name="about_application_version">アプリのバージョン：%s</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tuskyは無料のオープンソースソフトウェアです。<!--
      -->GNU General Public License Version 3 の下で使用許諾されています。<!--
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ae8299f3a..7a1efb187 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -60,22 +60,16 @@
     <string name="action_send">Toot</string>
     <string name="action_send_public">TOOT!</string>
     <string name="action_retry">Opnieuw proberen</string>
-    <string name="action_mark_sensitive">Media als gevoelig markeren</string>
     <string name="action_hide_text">Tekst achter waarschuwing verbergen</string>
-    <string name="action_ok">OK</string>
-    <string name="action_cancel">Annuleren</string>
     <string name="action_close">Sluiten</string>
-    <string name="action_back">Terug</string>
     <string name="action_view_profile">Profiel</string>
     <string name="action_view_preferences">Voorkeuren</string>
     <string name="action_view_favourites">Favorieten</string>
     <string name="action_view_mutes">Genegeerde gebruikers</string>
     <string name="action_view_follow_requests">Volgverzoeken</string>
     <string name="action_view_blocks">Geblokkeerde gebruikers</string>
-    <string name="action_view_thread">Conversatie</string>
     <string name="action_view_media">Media</string>
     <string name="action_open_in_web">Open in webbrowser</string>
-    <string name="action_submit">Opslaan</string>
     <string name="action_photo_pick">Foto of video toevoegen</string>
     <string name="action_photo_take">Foto of video maken</string>
     <string name="action_share">Delen</string>
@@ -85,7 +79,6 @@
     <string name="action_hide_media">Media verbergen</string>
     <string name="action_compose_options">Opties</string>
     <string name="action_open_drawer">Menu openen</string>
-    <string name="action_clear">Leegmaken</string>
     <string name="action_save">Save</string>
     <string name="action_edit_profile">Profiel bewerken</string>
     <string name="action_undo">Ongedaan maken</string>
@@ -173,7 +166,6 @@
     <string name="notification_title_summary">%d nieuwe interacties</string>
     <string name="description_account_locked">Geblokkeerde account</string>
     <string name="about_title_activity">Over</string>
-    <string name="about_application_version">App-versie: %s</string>
     <string name="about_project_site">
         Projectwebsite:\n
         https://tusky.keylesspalace.com
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 870d264f0..18993c581 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -79,22 +79,16 @@
     <string name="action_send">Wyślij</string>
     <string name="action_send_public">Wyślij!</string>
     <string name="action_retry">Spróbuj ponownie</string>
-    <string name="action_mark_sensitive">Oznacz wrażliwe treści</string>
     <string name="action_hide_text">Ukryj tekst przed ostrzeżeniem</string>
-    <string name="action_ok">OK</string>
-    <string name="action_cancel">Anuluj</string>
     <string name="action_close">Zamknij</string>
-    <string name="action_back">Wróć</string>
     <string name="action_view_profile">Profil</string>
     <string name="action_view_preferences">Preferencje</string>
     <string name="action_view_favourites">Ulubione</string>
     <string name="action_view_mutes">Wyciszeni użytkownicy</string>
     <string name="action_view_blocks">Zablokowani użytkownicy</string>
     <string name="action_view_follow_requests">Prośby o możliwość śledzenia</string>
-    <string name="action_view_thread">Wątek</string>
     <string name="action_view_media">Treści multimedialne</string>
     <string name="action_open_in_web">Otwórz w przeglądarce</string>
-    <string name="action_submit">Wyślij</string>
     <string name="action_photo_pick">Dodaj treści multimedialne</string>
     <string name="action_photo_take">Wykonaj zdjęcie</string>
     <string name="action_share">Udostępnij</string>
@@ -104,7 +98,6 @@
     <string name="action_hide_media">Ukryj zawartość multimedialną</string>
     <string name="action_compose_options">Opcje</string>
     <string name="action_open_drawer">Otwórz szufladę</string>
-    <string name="action_clear">Wyczyść</string>
     <string name="action_save">Zapisz</string>
     <string name="action_edit_profile">Edytuj profil</string>
     <string name="action_undo">Cofnij</string>
@@ -252,7 +245,6 @@
     <string name="about_title_activity">O programie</string>
     <string name="about_tusky_license">Tusky jest wolnym i otwartoźródłowym oprogramowaniem. Jest dostępny na licencji GNU General Public License w wersji trzeciej. Możesz przeczytać treść licencji tutaj: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- It would be nice to change the link to link to Polish translation of GPLv3… -->
-    <string name="about_application_version">Wersja aplikacji: %s</string>
     <string name="about_project_site">
         Strona projektu:\n
         https://tusky.keylesspalace.com
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0e61b3f8b..bd24cbf3a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -69,22 +69,16 @@
     <string name="action_send">TOOT</string>
     <string name="action_send_public">TOOT!</string>
     <string name="action_retry">Tentar novamente</string>
-    <string name="action_mark_sensitive">Marcar mídia como sensível</string>
     <string name="action_hide_text">Esconder texto com aviso de conteúdo</string>
-    <string name="action_ok">Ok</string>
-    <string name="action_cancel">Cancelar</string>
     <string name="action_close">Fechar</string>
-    <string name="action_back">Voltar</string>
     <string name="action_view_profile">Perfil</string>
     <string name="action_view_preferences">Preferências</string>
     <string name="action_view_favourites">Favoritos</string>
     <string name="action_view_mutes">Usuários silenciados</string>
     <string name="action_view_blocks">Usuários bloqueados</string>
     <string name="action_view_follow_requests">Solicitações de seguidor</string>
-    <string name="action_view_thread">Sequência</string>
     <string name="action_view_media">Mídia</string>
     <string name="action_open_in_web">Abrir no navegador</string>
-    <string name="action_submit">Enviar</string>
     <string name="action_photo_pick">Adicionar mídia</string>
     <string name="action_photo_take">Tirar foto</string>
     <string name="action_share">Compartilhar</string>
@@ -94,7 +88,6 @@
     <string name="action_hide_media">Esconder mídia</string>
     <string name="action_compose_options">Opções</string>
     <string name="action_open_drawer">Abrir gaveta</string>
-    <string name="action_clear">Limpar</string>
     <string name="action_save">Salvar</string>
     <string name="action_edit_profile">Editar perfil</string>
     <string name="action_undo">Desfazer</string>
@@ -193,7 +186,6 @@
     <string name="description_account_locked">Conta trancada</string>
 
     <string name="about_title_activity">Sobre</string>
-    <string name="about_application_version">Versão: %s</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky é um software gratuito e de código aberto.
        Ele é licenciado sob a versão 3 da Licença Pública Geral GNU.
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7dd904b08..3389c12bc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -70,22 +70,16 @@
     <string name="action_send">ТРУБИТЬ</string>
     <string name="action_send_public">ТРУБИТЬ!</string>
     <string name="action_retry">Повторить</string>
-    <string name="action_mark_sensitive">Отметить как чувствительный контент</string>
     <string name="action_hide_text">Скрыть текст за предупреждением</string>
-    <string name="action_ok">ОК</string>
-    <string name="action_cancel">Отмена</string>
     <string name="action_close">Закрыть</string>
-    <string name="action_back">Назад</string>
     <string name="action_view_profile">Профиль</string>
     <string name="action_view_preferences">Настройки</string>
     <string name="action_view_favourites">Понравившееся</string>
     <string name="action_view_mutes">Список глушения</string>
     <string name="action_view_blocks">Список блокировки</string>
     <string name="action_view_follow_requests">Запросы на подписку</string>
-    <string name="action_view_thread">Обсуждение</string>
     <string name="action_view_media">Медиаконтент</string>
     <string name="action_open_in_web">Открыть в браузере</string>
-    <string name="action_submit">Отправить</string>
     <string name="action_photo_pick">Добавить медиаконтент</string>
     <string name="action_photo_take">Сфотографировать</string>
     <string name="action_share">Поделиться</string>
@@ -95,7 +89,6 @@
     <string name="action_hide_media">Скрыть медиаконтент</string>
     <string name="action_compose_options">Опции</string>
     <string name="action_open_drawer">Нарисовать</string>
-    <string name="action_clear">Очистить</string>
     <string name="action_save">Сохранить</string>
     <string name="action_edit_profile">Редактировать профиль</string>
     <string name="action_undo">Отменить</string>
@@ -213,7 +206,6 @@
     <string name="description_account_locked">Закрытый аккаунт</string>
 
     <string name="about_title_activity">О приложении</string>
-    <string name="about_application_version">Версия приложения: %s</string>
     <string name="about_project_site">
         Веб-сайт проекта\n
         https://tusky.keylesspalace.com
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 40161ce0c..3513c6eec 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -66,21 +66,15 @@
     <string name="action_send">İLET</string>
     <string name="action_send_public">İLET!</string>
     <string name="action_retry">Tekrar dene</string>
-    <string name="action_mark_sensitive">Medyayı hassas olarak etiketle</string>
     <string name="action_hide_text">İçerik uyarıyla gizlensin</string>
-    <string name="action_ok">Tamam</string>
-    <string name="action_cancel">İptal</string>
     <string name="action_close">Kapat</string>
-    <string name="action_back">Geri</string>
     <string name="action_view_profile">Profil</string>
     <string name="action_view_preferences">Ayarlar</string>
     <string name="action_view_favourites">Favoriler</string>
     <string name="action_view_mutes">Sesize alınmış kullanıcılar</string>
     <string name="action_view_blocks">Engellenmiş kullanıcılar</string>
-    <string name="action_view_thread">Dizi</string>
     <string name="action_view_media">Medya</string>
     <string name="action_open_in_web">Tarayıcıda aç</string>
-    <string name="action_submit">Gönder</string>
     <string name="action_photo_pick">Medya ekle</string>
     <string name="action_photo_take">Resim çek</string>
     <string name="action_share">Paylaş</string>
@@ -90,7 +84,6 @@
     <!--<string name="action_mark_sensitive">Mark media sensitive</string>-->
     <string name="action_compose_options">Seçenekler</string>
     <string name="action_open_drawer">Çekmece aç</string>
-    <string name="action_clear">Temizle</string>
     <string name="action_save">Kaydet</string>
     <string name="action_edit_profile">Profili düzelt</string>
     <string name="action_undo">Geri al</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69afd0dfc..d5830c061 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,22 +71,16 @@
     <string name="action_send">TOOT</string>
     <string name="action_send_public">TOOT!</string>
     <string name="action_retry">Retry</string>
-    <string name="action_mark_sensitive">Mark media sensitive</string>
     <string name="action_hide_text">Hide text behind warning</string>
-    <string name="action_ok">Ok</string>
-    <string name="action_cancel">Cancel</string>
     <string name="action_close">Close</string>
-    <string name="action_back">Back</string>
     <string name="action_view_profile">Profile</string>
     <string name="action_view_preferences">Preferences</string>
     <string name="action_view_favourites">Favourites</string>
     <string name="action_view_mutes">Muted users</string>
     <string name="action_view_blocks">Blocked users</string>
     <string name="action_view_follow_requests">Follow Requests</string>
-    <string name="action_view_thread">Thread</string>
     <string name="action_view_media">Media</string>
     <string name="action_open_in_web">Open in browser</string>
-    <string name="action_submit">Submit</string>
     <string name="action_photo_pick">Add media</string>
     <string name="action_photo_take">Take photo</string>
     <string name="action_share">Share</string>
@@ -96,7 +90,6 @@
     <string name="action_hide_media">Hide media</string>
     <string name="action_compose_options">Options</string>
     <string name="action_open_drawer">Open drawer</string>
-    <string name="action_clear">Clear</string>
     <string name="action_save">Save</string>
     <string name="action_edit_profile">Edit profile</string>
     <string name="action_undo">Undo</string>
@@ -237,7 +230,6 @@
     <string name="description_account_locked">Locked Account</string>
 
     <string name="about_title_activity">About</string>
-    <string name="about_application_version">Version: %s</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky is free and open-source software.
         It is licensed under the GNU General Public License Version 3.