From e07e4fc223f213ff467bf470afa3e318ac0d4003 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 13 May 2017 00:08:07 +0200
Subject: [PATCH 1/2] convert strings to plurals, and make lint enforces this

Lots of languages really need the <plurals> tags to make sense, so
this also makes lint exit with an error when it finds strings that
should be <plurals>

closes #883
---
 app/lint.xml                                      |  2 +-
 .../org/fdroid/fdroid/NotificationHelper.java     | 14 ++++++++------
 app/src/main/res/values-af/strings.xml            |  3 ---
 app/src/main/res/values-ar/strings.xml            |  3 ---
 app/src/main/res/values-ast/strings.xml           |  3 ---
 app/src/main/res/values-be/strings.xml            |  3 ---
 app/src/main/res/values-bg/strings.xml            |  1 -
 app/src/main/res/values-ca/strings.xml            |  3 ---
 app/src/main/res/values-cs/strings.xml            |  3 ---
 app/src/main/res/values-da/strings.xml            |  1 -
 app/src/main/res/values-de/strings.xml            |  3 ---
 app/src/main/res/values-el/strings.xml            |  1 -
 app/src/main/res/values-eo/strings.xml            |  3 ---
 app/src/main/res/values-es/strings.xml            |  3 ---
 app/src/main/res/values-et/strings.xml            |  1 -
 app/src/main/res/values-eu/strings.xml            |  3 ---
 app/src/main/res/values-fa/strings.xml            |  3 ---
 app/src/main/res/values-fi/strings.xml            |  3 ---
 app/src/main/res/values-fr/strings.xml            |  3 ---
 app/src/main/res/values-gl/strings.xml            |  1 -
 app/src/main/res/values-he/strings.xml            |  1 -
 app/src/main/res/values-hi/strings.xml            |  1 -
 app/src/main/res/values-hr/strings.xml            |  1 -
 app/src/main/res/values-hu/strings.xml            |  1 -
 app/src/main/res/values-hy/strings.xml            |  3 ---
 app/src/main/res/values-id/strings.xml            |  3 ---
 app/src/main/res/values-is/strings.xml            |  3 ---
 app/src/main/res/values-it/strings.xml            |  3 ---
 app/src/main/res/values-ja/strings.xml            |  3 ---
 app/src/main/res/values-ko/strings.xml            |  1 -
 app/src/main/res/values-my/strings.xml            |  1 -
 app/src/main/res/values-nb/strings.xml            |  3 ---
 app/src/main/res/values-nl/strings.xml            |  3 ---
 app/src/main/res/values-pl/strings.xml            |  3 ---
 app/src/main/res/values-pt-rBR/strings.xml        |  3 ---
 app/src/main/res/values-pt-rPT/strings.xml        |  3 ---
 app/src/main/res/values-ro/strings.xml            |  3 ---
 app/src/main/res/values-ru/strings.xml            |  3 ---
 app/src/main/res/values-sc/strings.xml            |  3 ---
 app/src/main/res/values-sk/strings.xml            |  3 ---
 app/src/main/res/values-sn/strings.xml            |  3 ---
 app/src/main/res/values-sr/strings.xml            |  3 ---
 app/src/main/res/values-sv/strings.xml            |  3 ---
 app/src/main/res/values-th/strings.xml            |  1 -
 app/src/main/res/values-tr/strings.xml            |  3 ---
 app/src/main/res/values-uk/strings.xml            |  3 ---
 app/src/main/res/values-vi/strings.xml            |  1 -
 app/src/main/res/values-zh-rCN/strings.xml        |  1 -
 app/src/main/res/values-zh-rHK/strings.xml        |  3 ---
 app/src/main/res/values-zh-rTW/strings.xml        |  3 ---
 app/src/main/res/values/strings.xml               | 15 ++++++++++++---
 51 files changed, 21 insertions(+), 126 deletions(-)

diff --git a/app/lint.xml b/app/lint.xml
index 52da393fb..d8647ae0b 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -14,7 +14,7 @@
     <issue id="StringFormatCount" severity="error"/>
     <issue id="UnsafeProtectedBroadcastReceiver" severity="error"/>
 
-    <!-- Change the severity of hardcoded strings to "error" -->
+    <issue id="PluralsCandidate" severity="error"/>
     <issue id="HardcodedText" severity="error"/>
 
     <!-- both the correct and deprecated locales need to be present for
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index 9871c7b52..1c3e05576 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -21,7 +21,6 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
 import android.view.View;
-
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
@@ -29,7 +28,6 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.assist.ImageSize;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.utils.DiskCacheUtils;
-
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.views.main.MainActivity;
 
@@ -347,7 +345,8 @@ class NotificationHelper {
     }
 
     private Notification createUpdateSummaryNotification(ArrayList<AppUpdateStatusManager.AppUpdateStatus> updates) {
-        String title = context.getString(R.string.notification_summary_updates, updates.size());
+        String title = context.getResources().getQuantityString(R.plurals.notification_summary_updates,
+                updates.size(), updates.size());
         StringBuilder text = new StringBuilder();
 
         NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
@@ -373,7 +372,8 @@ class NotificationHelper {
 
         if (updates.size() > MAX_UPDATES_TO_SHOW) {
             int diff = updates.size() - MAX_UPDATES_TO_SHOW;
-            inboxStyle.setSummaryText(context.getString(R.string.notification_summary_more, diff));
+            inboxStyle.setSummaryText(context.getResources().getQuantityString(R.plurals.notification_summary_more,
+                    diff, diff));
         }
 
         // Intent to open main app list
@@ -434,7 +434,8 @@ class NotificationHelper {
     }
 
     private Notification createInstalledSummaryNotification(ArrayList<AppUpdateStatusManager.AppUpdateStatus> installed) {
-        String title = context.getString(R.string.notification_summary_installed, installed.size());
+        String title = context.getResources().getQuantityString(R.plurals.notification_summary_installed,
+                installed.size(), installed.size());
         StringBuilder text = new StringBuilder();
 
         NotificationCompat.BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle();
@@ -451,7 +452,8 @@ class NotificationHelper {
         bigTextStyle.bigText(text);
         if (installed.size() > MAX_INSTALLED_TO_SHOW) {
             int diff = installed.size() - MAX_INSTALLED_TO_SHOW;
-            bigTextStyle.setSummaryText(context.getString(R.string.notification_summary_more, diff));
+            bigTextStyle.setSummaryText(context.getResources().getQuantityString(R.plurals.notification_summary_more,
+                    diff, diff));
         }
 
         // Intent to open main app list
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 85f5b02c3..496a5b249 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -450,7 +450,6 @@
     </string>
     <string name="crash_dialog_comment_prompt">Jy kan ekstra inligting en kommentaar hier laat:</string>
 
-    <string name="notification_summary_more">+%1$d meer…</string>
     <string name="notification_title_single_update_available">Opdatering beskikbaar</string>
     <string name="install_confirm_update_system">Wil jy \'n opdatering installeer
         vir hierdie ingeboude program? Jou bestaande data sal nie verloor word nie.
@@ -464,8 +463,6 @@
     <string name="notification_content_single_installing">Installeer tans \"%1$s\"…</string>
     <string name="notification_content_single_installed">Suksesvol geïnstalleer</string>
     <string name="notification_content_single_install_error">Installering het misluk</string>
-    <string name="notification_summary_updates">%1$d Opdaterings</string>
-    <string name="notification_summary_installed">%1$d programme geïnstalleer</string>
     <string name="notification_title_summary_update_available">Opdatering beskikbaar</string>
     <string name="notification_title_summary_downloading">Laai tans af…</string>
     <string name="notification_title_summary_downloading_update">Besig met aflaai van opdatering …</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5fd407d26..afd76a4d0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -118,7 +118,6 @@
     <string name="overwrite">استبدال</string>
 
     <string name="fdroid_updates_available">تحديثات اف-درويد متوفرة</string>
-    <string name="notification_summary_more">+%1$d المزيد…</string>
     <string name="bluetooth_activity_not_found">لا توجد طريقة إرسال بلوتوث، فضلاً إختر واحدة !</string>
     <string name="repo_exists_add_fingerprint">هذه المستودعات بالفعل موجودة، بهذا سوف يتم إضافة مفتاح معلومات جديد.
     </string>
@@ -466,8 +465,6 @@
     <string name="notification_title_single_update_available">تحديث متوفر</string>
     <string name="notification_content_single_downloading">جاري تنزيل \"%1$s\"…</string>
     <string name="notification_content_single_downloading_update">جاري تنزيل تحديث \"%1$s\"…</string>
-    <string name="notification_summary_updates">%1$d تحديثات</string>
-    <string name="notification_summary_installed">%1$d تطبيقات مثبتة</string>
     <string name="notification_title_summary_update_available">تحديث متوفر</string>
     <string name="notification_title_summary_downloading">جاري تنزيل …</string>
     <string name="notification_title_summary_downloading_update">جاري تنزيل التحديث …</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 03534422b..f0f445ae6 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -239,7 +239,6 @@
     <string name="links">Enllaces</string>
 
     <string name="back">Atrás</string>
-    <string name="notification_summary_more">+%1$d más…</string>
     <string name="bad_fingerprint">Buelga incorreuta</string>
     <string name="invalid_url">Esto nun ye una URL válida.</string>
     <string name="menu_changelog">Rexistru de cambeos</string>
@@ -455,8 +454,6 @@
     <string name="notification_content_single_installing">Instalando «%1$s»…</string>
     <string name="notification_content_single_installed">Instalóse con ésitu</string>
     <string name="notification_content_single_install_error">Falló la instalación</string>
-    <string name="notification_summary_updates">%1$d anovamientos</string>
-    <string name="notification_summary_installed">%1$d aplicaciones instalaes</string>
     <string name="notification_title_summary_update_available">Anovamientu disponible</string>
     <string name="notification_title_summary_downloading">Baxando…</string>
     <string name="notification_title_summary_downloading_update">Baxando anovamientu…</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 228d1455e..f52ed6e23 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -429,7 +429,6 @@
     </string>
     <string name="crash_dialog_comment_prompt">Можаце ўвясці дадатковую інфармацыю і каментары тут:</string>
 
-    <string name="notification_summary_more">+%1$d больш…</string>
     <string name="notification_title_single_update_available">Даступна абнаўленне</string>
     <string name="notification_title_single_ready_to_install">Гатовая да ўсталёўкі</string>
     <string name="notification_title_single_ready_to_install_update">Абнаўленне гатовая да ўсталёўкі</string>
@@ -439,8 +438,6 @@
     <string name="notification_content_single_installing">Усталёўка «%1$s»…</string>
     <string name="notification_content_single_installed">Паспяхова ўсталявана</string>
     <string name="notification_content_single_install_error">Не атрымалася ўсталяваць</string>
-    <string name="notification_summary_updates">Абнаўленняў: %1$d</string>
-    <string name="notification_summary_installed">Усталявана праграм: %1$d</string>
     <string name="notification_title_summary_update_available">Даступна абнаўленне</string>
     <string name="notification_title_summary_downloading">Спампоўка…</string>
     <string name="notification_title_summary_downloading_update">Спампоўка абнаўлення…</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cb1e85d1d..0f5047ca6 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -194,7 +194,6 @@
     <string name="downloading">Сваляне…</string>
 
     <string name="about_source">Изходен код</string>
-    <string name="notification_summary_more">+ още %1$d…</string>
     <string name="update_notification_title">Актуализиране на хранилищата</string>
     <string name="install_error_unknown">Инсталирането се провали поради неизвестна грешка</string>
     <string name="uninstall_error_unknown">Деинсталирането се провали поради неизвестна грешка</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index d88a41de0..18a35f7d2 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -195,7 +195,6 @@
     <string name="links">Enllaços</string>
 
     <string name="back">Torna</string>
-    <string name="notification_summary_more">+%1$d més…</string>
     <string name="pref_language">Idioma</string>
     <string name="wifi">Wi-Fi</string>
     <string name="category_Graphics">Gràfics</string>
@@ -452,8 +451,6 @@
     <string name="notification_content_single_installing">Instal·lant \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instal·lació correcta</string>
     <string name="notification_content_single_install_error">Instal·lació fallida</string>
-    <string name="notification_summary_updates">%1$d actualitzacions</string>
-    <string name="notification_summary_installed">%1$d Apps instal·lades</string>
     <string name="notification_title_summary_update_available">Actualització disponible</string>
     <string name="notification_title_summary_downloading">Descarregant…</string>
     <string name="notification_title_summary_downloading_update">Descarregant una actualització…</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 53dbbf0f2..0c5921770 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -164,7 +164,6 @@
     <string name="links">Odkazy</string>
 
     <string name="back">Zpět</string>
-    <string name="notification_summary_more">+%1$d více…</string>
     <string name="bluetooth_activity_not_found">Nerozpoznána žádná Bluetooth metoda přenosu, nějakou vyberte!</string>
     <string name="choose_bt_send">Vyberte metodu přenosu Bluetooth</string>
     <string name="repo_exists_add_fingerprint">Tento repozitář je již nastaven, budou jen přidány nové klíče.</string>
@@ -436,8 +435,6 @@
     <string name="notification_content_single_installing">Instalování \"%1$s\"…</string>
     <string name="notification_content_single_installed">Úspěšně nainstalováno</string>
     <string name="notification_content_single_install_error">Instalace selhala</string>
-    <string name="notification_summary_updates">%1$d aktualizací</string>
-    <string name="notification_summary_installed">%1$d aplikací nainstalováno</string>
     <string name="notification_title_summary_update_available">Dostupná aktualizace</string>
     <string name="notification_title_summary_downloading">Stahování…</string>
     <string name="notification_title_summary_downloading_update">Stahování aktualizace…</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7669a8e94..7eda86708 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -81,7 +81,6 @@
     <string name="overwrite">Overskriv</string>
 
     <string name="fdroid_updates_available">F-Droid Opdateringer Tilgængelige</string>
-    <string name="notification_summary_more">+%1$d flere…</string>
     <string name="bluetooth_activity_not_found">Ingen Bluetooth afsendelsesmetode fundet, vælg en!</string>
     <string name="choose_bt_send">Vælg Bluetooth afsendelsesmetode</string>
     <string name="send_via_bluetooth">Send over Bluetooth</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f8e2a1208..02ae627df 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -199,7 +199,6 @@
     <string name="app_incompatible">Inkompatibel</string>
     <string name="links">Verweise</string>
     <string name="back">Zurück</string>
-    <string name="notification_summary_more">+%1$d weitere …</string>
     <string name="bad_fingerprint">Falscher Fingerabdruck</string>
     <string name="invalid_url">Das ist keine gültige Adresse.</string>
     <string name="update_notification_title">Paketquellen werden aktualisiert</string>
@@ -443,8 +442,6 @@
     <string name="notification_content_single_installing">»%1$s« wird installiert …</string>
     <string name="notification_content_single_installed">Erfolgreich installiert</string>
     <string name="notification_content_single_install_error">Installation fehlgeschlagen</string>
-    <string name="notification_summary_updates">%1$d Aktualisierungen</string>
-    <string name="notification_summary_installed">%1$d Apps installiert</string>
     <string name="notification_title_summary_update_available">Aktualisierung verfügbar</string>
     <string name="notification_title_summary_downloading">wird heruntergeladen …</string>
     <string name="notification_title_summary_downloading_update">Aktualisierung wird heruntergeladen …</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index dc53e59ed..84e70050b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -156,7 +156,6 @@
     <string name="less">Λιγότερα</string>
 
     <string name="back">Πίσω</string>
-    <string name="notification_summary_more">+%1$d περισσότερα…</string>
     <string name="send_via_bluetooth">Αποστολή μέσω Bluetooth</string>
 
     <string name="bad_fingerprint">Λανθασμένο δακτυλικό αποτύπωμα</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 03a21024d..fc3852916 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -148,7 +148,6 @@
     <string name="back">Reen</string>
     <string name="enable">Aktivigi</string>
     <string name="add_key">Aldoni ŝlosilon</string>
-    <string name="notification_summary_more">ankoraŭ +%1$d…</string>
     <string name="bluetooth_activity_not_found">Neniu Bludenta metodo de sendo trovita, elektu iun!</string>
     <string name="choose_bt_send">Elektu Bludentan metodon de sendo</string>
     <string name="repo_add_fingerprint">Fingrospuro (malnepra)</string>
@@ -435,8 +434,6 @@
     <string name="notification_content_single_installing">Instalado de \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalado sukcesis</string>
     <string name="notification_content_single_install_error">Instalado fiaskis</string>
-    <string name="notification_summary_updates">%1$d ĝisdatigoj</string>
-    <string name="notification_summary_installed">Instalis %1$d aplikaĵojn</string>
     <string name="notification_title_summary_update_available">Disponebla ĝisdatigo</string>
     <string name="notification_title_summary_downloading">Elŝutado…</string>
     <string name="notification_title_summary_downloading_update">Elŝutado de ĝisdatigo…</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f15c0d858..d239901c7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -200,7 +200,6 @@
     <string name="links">Enlaces</string>
 
     <string name="back">Volver</string>
-    <string name="notification_summary_more">+%1$d más…</string>
     <string name="uninstall_system">Actualiza/Desinstala la extensión con permisos de sistema</string>
     <string name="uninstall_system_summary">Abre la pantalla de detalles de la extensión con permisos de sistema para
         actualizarla/desinstalarla
@@ -455,8 +454,6 @@ tenéis acceso a la misma red, uno de vosotros puede crear un punto de acceso Wi
     <string name="notification_content_single_installing">Instalando \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalación correcta</string>
     <string name="notification_content_single_install_error">Instalación fallida</string>
-    <string name="notification_summary_updates">%1$d actualizaciones</string>
-    <string name="notification_summary_installed">%1$d apps instaladas</string>
     <string name="notification_title_summary_update_available">Actualización disponible</string>
     <string name="notification_title_summary_downloading">Descargando…</string>
     <string name="notification_title_summary_downloading_update">Descargando actualización…</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 5773cdf83..b63687658 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -83,7 +83,6 @@
     <string name="overwrite">Kirjuta üle</string>
 
     <string name="fdroid_updates_available">F-Droid: värskendused saadaval</string>
-    <string name="notification_summary_more">+%1$d veel…</string>
     <string name="bluetooth_activity_not_found">Bluetoothiga saatmisviise ei leitud. Valige üks!</string>
     <string name="choose_bt_send">Vali Bluetoothiga saatmise viis</string>
     <string name="send_via_bluetooth">Saada Bluetoothiga</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 2fbfa6f88..675e4d8d9 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -104,7 +104,6 @@
     <string name="links">Loturak</string>
 
     <string name="back">Atzera</string>
-    <string name="notification_summary_more">+%1$d gehiago…</string>
     <string name="bluetooth_activity_not_found">Ez da aurkitu Bluetooth bidez bidaltzeko metodorik, aukeratu bat!</string>
     <string name="choose_bt_send">Aukeratu Bluetooth bidez bidaltzeko metodoa</string>
     <string name="send_via_bluetooth">Bidali Bluetooth bidez</string>
@@ -448,8 +447,6 @@
     <string name="notification_content_single_installing">\"%1$s\" instalatzen…</string>
     <string name="notification_content_single_installed">Ongi instalatu da</string>
     <string name="notification_content_single_install_error">Instalazioak huts egin du</string>
-    <string name="notification_summary_updates">%1$d eguneraketa</string>
-    <string name="notification_summary_installed">%1$d Aplikazio instalatuta</string>
     <string name="notification_title_summary_update_available">Eguneraketa eskuragarri</string>
     <string name="notification_title_summary_downloading">Deskargatzen…</string>
     <string name="notification_title_summary_downloading_update">Eguneraketa deskargatzen…</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 18b0e0e0c..3caea7730 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -115,7 +115,6 @@
     <string name="less">کم‌تر</string>
 
     <string name="back">بازگشت</string>
-    <string name="notification_summary_more">+%1$d بیش‌تر…</string>
     <string name="send_via_bluetooth">ارسال با بلوتوث</string>
 
     <string name="repo_exists_add_fingerprint">این مخزن از پیش برپا شده است. این کار، اطّلاعات کلید جدیدی را می‌افزاید.</string>
@@ -493,8 +492,6 @@
     <string name="notification_content_single_installing">در حال نصب «%1$s»…</string>
     <string name="notification_content_single_installed">با موفّقیت نصب شد</string>
     <string name="notification_content_single_install_error">نصب شکست خورد</string>
-    <string name="notification_summary_updates">‫%1$d به‌روز رسانی</string>
-    <string name="notification_summary_installed">‫%1$d کاره نصب شدند</string>
     <string name="notification_title_summary_update_available">به‌روز رسانی موجود است</string>
     <string name="notification_title_summary_downloading">در حال بارگیری…</string>
     <string name="notification_title_summary_downloading_update">در حال بارگیری به‌روز رسانی…</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f6dfe8cf8..edf2aaca1 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -193,7 +193,6 @@
     <string name="more">Lisää</string>
     <string name="less">Vähemmän</string>
 
-    <string name="notification_summary_more">+%1$d lisää…</string>
     <string name="update_auto_download">Hae päivitykset automaattisesti</string>
     <string name="update_auto_download_summary">"Päivitykset ladataan automaattisesti ja sinulle ilmoitetaan niiden
 asentamisesta
@@ -484,8 +483,6 @@ asentamisesta
     <string name="notification_content_single_installing">Asennetaan \"%1$s\"…</string>
     <string name="notification_content_single_installed">Asennettu onnistuneesti</string>
     <string name="notification_content_single_install_error">Asennus Epäonnistui</string>
-    <string name="notification_summary_updates">%1$d Päivitystä</string>
-    <string name="notification_summary_installed">%1$d Sovellusta Asennettu</string>
     <string name="notification_title_summary_update_available">Päivitys saatavilla</string>
     <string name="notification_title_summary_downloading">Ladataan…</string>
     <string name="notification_title_summary_downloading_update">Ladataan päivitystä…</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a6a5be1b5..301be84e4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -318,7 +318,6 @@
     <string name="uninstall_system_summary">Ouvrir l\'écran des détails de l\'appli F-Droid Privileged Extension pour la
         mettre à jour/la désinstaller
     </string>
-    <string name="notification_summary_more">%1$d de plus…</string>
     <string name="status_download_unknown_size">Téléchargement de
         \n%2$s depuis
         \n%1$s
@@ -448,8 +447,6 @@
     <string name="notification_content_single_installing">Installation de « %1$s »…</string>
     <string name="notification_content_single_installed">Installation réussie</string>
     <string name="notification_content_single_install_error">L’installation a échoué</string>
-    <string name="notification_summary_updates">%1$d mises à jour</string>
-    <string name="notification_summary_installed">%1$d applications installées</string>
     <string name="notification_title_summary_update_available">Mise à jour disponible</string>
     <string name="notification_title_summary_downloading">Téléchargement…</string>
     <string name="notification_title_summary_downloading_update">Téléchargement de la mise à jour…</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 01fa15434..80aa49ab6 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -103,7 +103,6 @@
     <string name="add_key">Engadir chave</string>
     <string name="overwrite">Sobreescribir</string>
 
-    <string name="notification_summary_more">+%1$d máis…</string>
     <string name="bluetooth_activity_not_found">Non se atopou ningún método de transmisión Bluetooth, escolla un!
     </string>
     <string name="choose_bt_send">Escolla o método de transmisión Bluetooth</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 35d4c5f90..4d83bc66a 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -51,7 +51,6 @@
     <string name="overwrite">שכתוב</string>
 
     <string name="fdroid_updates_available">יש עדכונים ל־F-Droid</string>
-    <string name="notification_summary_more">+%1$d עוד…</string>
     <string name="bluetooth_activity_not_found">לא נמצאה שיטת שליחה של Bluetooth, נא לבחור אחת!</string>
     <string name="choose_bt_send">נא לבחור שיטת שליחה של Bluetooth</string>
     <string name="send_via_bluetooth">שליחה דרך Bluetooth</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index e3fe1aee8..24002b83d 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -148,7 +148,6 @@
     <string name="all_other_repos_fine">सभी दुसरे रेपो ने कोई गलती नहीं बनाई|</string>
     <string name="global_error_updating_repos">अपडेट के दौरान एरर: %s</string>
     <string name="fdroid_updates_available">F-Droid अपडेट उपलब्ध</string>
-    <string name="notification_summary_more">+%1$d और…</string>
     <string name="bluetooth_activity_not_found">Bluettoth से भेजने का तरीका उपलब नहीं है, एक चुने!</string>
     <string name="choose_bt_send">Bluetooth से भेजने का तरीका चुने</string>
     <string name="send_via_bluetooth">Bluetooth द्वारा भेजे</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c7bac9315..2b72671dc 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -84,7 +84,6 @@
     <string name="overwrite">Prepiši</string>
 
     <string name="fdroid_updates_available">Ažuriranja za F-Droid dostupna</string>
-    <string name="notification_summary_more">+%1$d više…</string>
     <string name="bluetooth_activity_not_found">Nije pronađena metoda slanja preko Bluetootha, odaberite jednu!</string>
     <string name="choose_bt_send">Odaberi metodu slanja preko Bluetootha</string>
     <string name="send_via_bluetooth">Pošalji preko Bluetootha</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d0433cede..df557c5a5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -132,7 +132,6 @@
     <string name="less">Kevesebb</string>
 
     <string name="back">Vissza</string>
-    <string name="notification_summary_more">+%1$d további…</string>
     <string name="send_via_bluetooth">Küldés Bluetooth-on</string>
 
     <string name="bad_fingerprint">Rossz ujjlenyomat</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 2bb15c501..3a33aa339 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -117,7 +117,6 @@
     <string name="theme_dark">Մուգ</string>
     <string name="theme_night">Գիշեր</string>
 
-    <string name="notification_summary_more">+%1$d ավել…</string>
     <string name="notification_title_single_update_available">Թարմացում է հասանելի</string>
     <string name="notification_title_single_ready_to_install">Պատրաստ է տեղադրման</string>
     <string name="notification_title_single_ready_to_install_update">Թարմացումը պատրաստ է տեղադրման</string>
@@ -127,8 +126,6 @@
     <string name="notification_content_single_installing">Տեղադրում եմ \"%1$s\"…</string>
     <string name="notification_content_single_installed">Բարեհաջող տեղադրվեց</string>
     <string name="notification_content_single_install_error">Տեղադրումը չհաջողվեց</string>
-    <string name="notification_summary_updates">%1$d թարմացում</string>
-    <string name="notification_summary_installed">%1$d տեղադրված ափփ</string>
     <string name="notification_title_summary_update_available">Թարմացում է հասանելի</string>
     <string name="notification_title_summary_downloading">Ներբեռնում եմ…</string>
     <string name="notification_title_summary_downloading_update">Ներբեռնում եմ թարմացումը…</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index f96ef360b..03d8bc4ce 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -170,7 +170,6 @@
     <string name="repo_last_update">Terakhir diperbarui</string>
     <string name="repo_name">Nama</string>
     <string name="unknown">Tidak diketahui</string>
-    <string name="notification_summary_more">+%1$d lainnya…</string>
     <string name="menu_settings">Pengaturan</string>
     <string name="rooted_on">Jangan bedakan warna apl yang membutuhkan izin root</string>
     <string name="unsigned_description">Ini artinya daftar
@@ -449,8 +448,6 @@
     <string name="notification_content_single_installing">Memasang \"%1$s\"…</string>
     <string name="notification_content_single_installed">Berhasil dipasang</string>
     <string name="notification_content_single_install_error">Gagal Memasang</string>
-    <string name="notification_summary_updates">%1$d Pembaruan</string>
-    <string name="notification_summary_installed">%1$d Apl Dipasang</string>
     <string name="notification_title_summary_update_available">Tersedia pembaruan</string>
     <string name="notification_title_summary_downloading">Mengunduh…</string>
     <string name="notification_title_summary_downloading_update">Mengunduh pembaruan…</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index b429972a8..a6f199ada 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -61,7 +61,6 @@
     <string name="overwrite">Skrifa yfir</string>
 
     <string name="fdroid_updates_available">Uppfærslur á F-Droid eru tiltækar</string>
-    <string name="notification_summary_more">+%1$d fleiri…</string>
     <string name="bluetooth_activity_not_found">Engin aðferð til sendingar með Bluetooth fannst, veldu eina!</string>
     <string name="choose_bt_send">Veldu aðferð til sendingar með Bluetooth</string>
     <string name="send_via_bluetooth">Senda með Bluetooth</string>
@@ -484,8 +483,6 @@
     <string name="notification_content_single_installing">Set upp \"%1$s\"…</string>
     <string name="notification_content_single_installed">Tókst að setja upp</string>
     <string name="notification_content_single_install_error">Uppsetning mistókst</string>
-    <string name="notification_summary_updates">%1$d uppfærslur</string>
-    <string name="notification_summary_installed">%1$d forrit uppsett</string>
     <string name="notification_title_summary_update_available">Uppfærslur tiltækar</string>
     <string name="notification_title_summary_downloading">Sæki…</string>
     <string name="notification_title_summary_downloading_update">Næ í uppfærslu…</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ae098dda6..2ab6ee937 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -379,7 +379,6 @@
         non saranno rimossi. Non richiede alcun permesso speciale.
     </string>
     <string name="allPerms">Tutte</string>
-    <string name="notification_summary_more">+%1$d rimanente…</string>
     <string name="swap_nearby">Scambio ravvicinato</string>
     <string name="empty_search_installed_app_list">Nessuna app installata corrispondente.</string>
     <string name="crash_dialog_comment_prompt">Puoi aggiungere altre informazioni e commenti qui:</string>
@@ -459,8 +458,6 @@
     <string name="notification_content_single_installing">Installazione \"%1$s\"…</string>
     <string name="notification_content_single_installed">Installato con successo</string>
     <string name="notification_content_single_install_error">Installazione fallita</string>
-    <string name="notification_summary_updates">%1$d aggiornamenti</string>
-    <string name="notification_summary_installed">%1$d app installate</string>
     <string name="notification_title_summary_update_available">Aggiornamento disponibile</string>
     <string name="notification_title_summary_downloading">Scaricamento…</string>
     <string name="notification_title_summary_downloading_update">Scaricamento aggiornamento…</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0510825c8..1a5fc50d7 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -187,7 +187,6 @@
     <string name="links">ﾘﾝｸ</string>
 
     <string name="back">戻る</string>
-    <string name="notification_summary_more">+%1$d 以上…</string>
     <string name="bad_fingerprint">ﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄが違います</string>
     <string name="invalid_url">有効な URL ではありません｡</string>
     <string name="menu_changelog">変更履歴</string>
@@ -409,12 +408,10 @@
     <string name="notification_content_single_installing">\"%1$s\" をｲﾝｽﾄｰﾙ中…</string>
     <string name="notification_content_single_installed">正常にｲﾝｽﾄｰﾙしました</string>
     <string name="notification_content_single_install_error">ｲﾝｽﾄｰﾙに失敗しました</string>
-    <string name="notification_summary_updates">%1$d 更新</string>
     <string name="notification_title_summary_update_available">更新が利用可能です</string>
     <string name="notification_title_summary_downloading_update">更新をﾀﾞｳﾝﾛｰﾄﾞしています…</string>
     <string name="notification_title_summary_ready_to_install_update">更新をｲﾝｽﾄｰﾙする準備ができました</string>
     <string name="notification_action_update">更新</string>
-    <string name="notification_summary_installed">%1$d ｱﾌﾟﾘをｲﾝｽﾄｰﾙしました</string>
     <string name="notification_title_summary_downloading">ﾀﾞｳﾝﾛｰﾄﾞ中…</string>
     <string name="notification_title_summary_ready_to_install">ｲﾝｽﾄｰﾙの準備完了</string>
     <string name="notification_title_summary_installing">ｲﾝｽﾄｰﾙ中</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 3cea91014..522d7edd9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -188,7 +188,6 @@
     <string name="less">접기</string>
 
     <string name="back">뒤로</string>
-    <string name="notification_summary_more">+%1$d 이상…</string>
     <string name="bad_fingerprint">올바르지 않은 핑거프린트</string>
     <string name="invalid_url">올바른 URL이 아닙니다.</string>
     <string name="menu_settings">설정</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index cb4c65626..6a1512592 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -79,7 +79,6 @@
     <string name="overwrite">ထပ္ေရးမည္</string>
 
     <string name="fdroid_updates_available">F-Droid အသစ္မြမ္းမံမႈရရွိႏိုင္သည္</string>
-    <string name="notification_summary_more">+%1$d ေနာက္ထပ္..</string>
     <string name="bluetooth_activity_not_found">ဘလူးသုဒ့္ႏွင့္ပို႔ရန္နည္းလမ္းရွာမေတြ႕ပါ။ တစ္ခုေရြးပါ!</string>
     <string name="choose_bt_send">ဘလူးသုဒ့္ႏွင့္ပို႔ေသာနည္းလမ္းကိုေရြးမည္</string>
     <string name="send_via_bluetooth">ဘလူးသုဒ့္မွတစ္ဆင့္ပို႔မည္</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 477fce6c3..b77700af5 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -195,7 +195,6 @@
     <string name="links">Lenker</string>
 
     <string name="back">Tilbake</string>
-    <string name="notification_summary_more">+%1$d mer…</string>
     <string name="bad_fingerprint">Feil i fingeravtrykk</string>
     <string name="invalid_url">Dette er ikke en gyldig nettadresse.</string>
     <string name="menu_changelog">Endringslogg</string>
@@ -447,8 +446,6 @@
     <string name="notification_content_single_installing">Installerer \"%1$s\"…</string>
     <string name="notification_content_single_installed">Installert</string>
     <string name="notification_content_single_install_error">Installering mislyktes</string>
-    <string name="notification_summary_updates">%1$d oppdateringer</string>
-    <string name="notification_summary_installed">%1$d programmer installert</string>
     <string name="notification_title_summary_update_available">Oppdatering tilgjengelig</string>
     <string name="notification_title_summary_downloading">Laster ned…</string>
     <string name="notification_title_summary_downloading_update">Laster ned oppdatering…</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e7a95bb8c..65c408cfc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -196,7 +196,6 @@
     <string name="links">Links</string>
 
     <string name="back">Terug</string>
-    <string name="notification_summary_more">+%1$d meer…</string>
     <string name="bad_fingerprint">Slechte vingerafdruk</string>
     <string name="invalid_url">Dit is geen correcte URL.</string>
     <string name="menu_changelog">Lijst van veranderingen</string>
@@ -491,8 +490,6 @@
     <string name="notification_content_single_installing">%1$s wordt geïnstalleerd…</string>
     <string name="notification_content_single_installed">Geïnstalleerd</string>
     <string name="notification_content_single_install_error">Installatie mislukt</string>
-    <string name="notification_summary_updates">%1$d updates</string>
-    <string name="notification_summary_installed">%1$d apps geïnstalleerd</string>
     <string name="notification_title_summary_update_available">Update beschikbaar</string>
     <string name="notification_title_summary_downloading">Wordt gedownload…</string>
     <string name="notification_title_summary_ready_to_install">Klaar voor installatie</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c34768201..b393ed019 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -162,7 +162,6 @@
     <string name="links">Linki</string>
 
     <string name="back">Powrót</string>
-    <string name="notification_summary_more">+%1$d więcej…</string>
     <string name="bluetooth_activity_not_found">Nie znaleziono metody do wysłania przez Bluetooth!</string>
     <string name="choose_bt_send">Wybierz metodę wysłania przez Bluetooth</string>
     <string name="repo_exists_add_fingerprint">To repozytorium jest już dodane. Klucz zostanie zaktualizowany.</string>
@@ -422,8 +421,6 @@
     <string name="notification_content_single_installing">Instalowanie \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalacja powiodła się</string>
     <string name="notification_content_single_install_error">Instalacja zakończona niepowodzeniem</string>
-    <string name="notification_summary_updates">%1$d aktualizacji</string>
-    <string name="notification_summary_installed">%1$d aplikacji zainstalowano</string>
     <string name="notification_title_summary_update_available">Dostępna aktualizacja</string>
     <string name="notification_title_summary_downloading">Pobieranie…</string>
     <string name="notification_title_summary_downloading_update">Pobieranie aktualizacji…</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b45531f8e..38f70981e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -203,7 +203,6 @@
     <string name="links">Links</string>
 
     <string name="back">Voltar</string>
-    <string name="notification_summary_more">Mais +%1$d…</string>
     <string name="bad_fingerprint">Falha na fingerprint</string>
     <string name="invalid_url">Esta não é uma URL válida.</string>
     <string name="menu_changelog">Changelog</string>
@@ -440,8 +439,6 @@
     <string name="notification_content_single_installing">Instalando \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalado com sucesso</string>
     <string name="notification_content_single_install_error">Falha na instalação</string>
-    <string name="notification_summary_updates">%1$d Atualizações</string>
-    <string name="notification_summary_installed">%1$d Aplicativos instalados</string>
     <string name="notification_title_summary_update_available">Atualização disponível</string>
     <string name="notification_title_summary_downloading">Baixando…</string>
     <string name="notification_title_summary_downloading_update">Baixando atualização…</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3aced9a09..b8594a418 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -72,7 +72,6 @@
     <string name="overwrite">Substituir</string>
 
     <string name="fdroid_updates_available">Atualizações F-Droid disponíveis</string>
-    <string name="notification_summary_more">+%1$d…</string>
     <string name="bluetooth_activity_not_found">Nenhum método de envio Bluetooth encontrado. Escolha um!</string>
     <string name="choose_bt_send">Escolha o método de envio Bluetooth</string>
     <string name="send_via_bluetooth">Enviar por Bluetooth</string>
@@ -514,8 +513,6 @@
     <string name="notification_content_single_installing">A instalar \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalação efetuada</string>
     <string name="notification_content_single_install_error">Falha ao instalar</string>
-    <string name="notification_summary_updates">%1$d atualizações</string>
-    <string name="notification_summary_installed">%1$d aplicações instaladas</string>
     <string name="notification_title_summary_update_available">Atualização disponível</string>
     <string name="notification_title_summary_downloading">A descarregar…</string>
     <string name="notification_title_summary_downloading_update">A descarregar atualização…</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b33330ceb..81ac054a5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -88,7 +88,6 @@
     <string name="overwrite">Suprascrie</string>
 
     <string name="fdroid_updates_available">Actualizari disponibile in F-Droid</string>
-    <string name="notification_summary_more">+%1$d mai mult…</string>
     <string name="bluetooth_activity_not_found">Nu a fost gasita o metoda Bluetooth de a trimite, alegeti una!</string>
     <string name="choose_bt_send">Alegeti metoda de a trimite prin Bluetooth</string>
     <string name="send_via_bluetooth">Trimite prin Bluetooth</string>
@@ -393,8 +392,6 @@
     <string name="notification_content_single_installing">Instalare \"%1$s\"…</string>
     <string name="notification_content_single_installed">Instalare reușită</string>
     <string name="notification_content_single_install_error">Instalarea a eșuat</string>
-    <string name="notification_summary_updates">%1$d actualizări</string>
-    <string name="notification_summary_installed">%1$d aplicații instalate</string>
     <string name="notification_title_summary_update_available">Actualizare disponibila</string>
     <string name="notification_title_summary_downloading">Descărcare…</string>
     <string name="notification_title_summary_downloading_update">Descărcare actualizare…</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index decdb967c..7847c395f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -236,7 +236,6 @@
     <string name="less">Меньше</string>
 
     <string name="back">Назад</string>
-    <string name="notification_summary_more">Детали +%1$d …</string>
     <string name="bad_fingerprint">Неверный отпечаток ключа</string>
     <string name="invalid_url">URL некорректен.</string>
     <string name="menu_changelog">Список изменений</string>
@@ -508,8 +507,6 @@
     </string>
 
     <string name="antifeatures">Нежелательный функционал</string>
-    <string name="notification_summary_updates">%1$d обновлений</string>
-    <string name="notification_summary_installed">%1$d приложений установлено</string>
     <string name="notification_title_summary_installing">Установка</string>
     <string name="notification_title_summary_installed">Успешно установлено</string>
     <string name="notification_title_summary_install_error">Установка не удалась</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 39a121ef4..ce933f815 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -202,7 +202,6 @@
     <string name="links">Ligàmenes</string>
 
     <string name="back">In dae segus</string>
-    <string name="notification_summary_more">+%1$d àteru(os)…</string>
     <string name="invalid_url">Custu no est unu ligàmene vàlidu.</string>
     <string name="menu_changelog">Lista modìficas</string>
     <string name="update_notification_title">Agiornende sos depòsitos</string>
@@ -446,8 +445,6 @@
     <string name="notification_content_single_installing">Installende \"%1$s\"…</string>
     <string name="notification_content_single_installed">Installatzione resissida</string>
     <string name="notification_content_single_install_error">Installatzione faddida</string>
-    <string name="notification_summary_updates">%1$d agiornamentos</string>
-    <string name="notification_summary_installed">%1$d aplicatziones installadas</string>
     <string name="notification_title_summary_update_available">Agiornamentu disponìbile</string>
     <string name="notification_title_summary_downloading">Iscarrighende…</string>
     <string name="notification_title_summary_downloading_update">Iscarrighende s\'agiornamentu…</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 1fceda2ab..c1518c207 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -202,7 +202,6 @@
     <string name="links">Linky</string>
 
     <string name="back">Späť</string>
-    <string name="notification_summary_more">+%1$d viac…</string>
     <string name="bluetooth_activity_not_found">Posielanie cez Bluetooth zlyhalo, zvoľte inú metódu!</string>
     <string name="choose_bt_send">Vyberte posielanie cez Bluetooth</string>
     <string name="repo_exists_and_enabled">Tento repozitár je už nastavený a povolený.</string>
@@ -433,8 +432,6 @@
     <string name="notification_content_single_installing">Inštalovanie \"%1$s\"…</string>
     <string name="notification_content_single_installed">Úspešne nainštalované</string>
     <string name="notification_content_single_install_error">Inštalácia zlyhala</string>
-    <string name="notification_summary_updates">%1$d Aktualizácií</string>
-    <string name="notification_summary_installed">%1$d Nainštalovaných aplikácií</string>
     <string name="notification_title_summary_update_available">Dostupná aktualizácia</string>
     <string name="notification_title_summary_downloading">Preberanie…</string>
     <string name="notification_title_summary_downloading_update">Preberanie aktualizácie…</string>
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index dcb79bb12..fdde03787 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -76,7 +76,6 @@
     <string name="overwrite">Nyorera pamusoro</string>
 
     <string name="fdroid_updates_available">Zvekunatsa F-Droid zviripo</string>
-    <string name="notification_summary_more">zvimwe +%1$d …</string>
     <string name="bluetooth_activity_not_found">Hapana mutowo wekutumira neBluetooth wawanikwa, sarudza imwe chete!
     </string>
     <string name="choose_bt_send">Sarudza mutowo weBluetooth wekutumira nawo</string>
@@ -469,8 +468,6 @@
     <string name="notification_content_single_installing">Kuvakirira \"%1$s\"…</string>
     <string name="notification_content_single_installed">Kuvakirira kwabudirira</string>
     <string name="notification_content_single_install_error">Kuvakirira kwaramba</string>
-    <string name="notification_summary_updates">%1$d Mawedzero</string>
-    <string name="notification_summary_installed">%1$d MaApps avakirirwa</string>
     <string name="notification_title_summary_update_available">Wedzero yavapo</string>
     <string name="notification_title_summary_downloading">Kututunura…</string>
     <string name="notification_title_summary_downloading_update">Kututunura wedzero…</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ad9106e48..2d7a9efe0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -196,7 +196,6 @@
     <string name="links">Везе</string>
 
     <string name="back">Назад</string>
-    <string name="notification_summary_more">+још %1$d…</string>
     <string name="bad_fingerprint">Лош отисак</string>
     <string name="invalid_url">Ово није исправна адреса.</string>
     <string name="menu_changelog">Дневник измена</string>
@@ -432,8 +431,6 @@
     <string name="notification_content_single_installing">Уграђујем „%1$s“…</string>
     <string name="notification_content_single_installed">Успешно уграђено</string>
     <string name="notification_content_single_install_error">Уградња није успела</string>
-    <string name="notification_summary_updates">%1$d надоградњи</string>
-    <string name="notification_summary_installed">%1$d уграђених апликација</string>
     <string name="notification_title_summary_update_available">Надоградња доступна</string>
     <string name="notification_title_summary_downloading">Преузимам…</string>
     <string name="notification_title_summary_downloading_update">Преузимам надоградњу…</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 365d8c408..dbbb51e9a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -195,7 +195,6 @@
     <string name="less">Mindre</string>
 
     <string name="back">Bakåt</string>
-    <string name="notification_summary_more">+%1$d mer…</string>
     <string name="bad_fingerprint">Felaktigt fingeravtryck</string>
     <string name="invalid_url">Det här är inte en giltig webbadress.</string>
     <string name="menu_settings">Inställningar</string>
@@ -449,8 +448,6 @@
     <string name="notification_content_single_installing">Installerar \"%1$s\"…</string>
     <string name="notification_content_single_installed">Installerardes</string>
     <string name="notification_content_single_install_error">Installering misslyckades</string>
-    <string name="notification_summary_updates">%1$d uppdateringar</string>
-    <string name="notification_summary_installed">%1$d appar installerade</string>
     <string name="notification_title_summary_update_available">Uppdatering tillgänglig</string>
     <string name="notification_title_summary_downloading">Hämtar…</string>
     <string name="notification_title_summary_downloading_update">Hämtar uppdatering…</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 8579e2b68..8971a94bc 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -333,7 +333,6 @@
     <string name="swap_not_visible_wifi">ไม่แสดงตัวบน Wi-Fi</string>
     <string name="swap_no_peers_nearby">ไม่พบคนรอบข้างที่สามารถจะแบ่งปันโปรแกรมด้วยได้</string>
     <string name="swap_qr_isnt_for_swap">QR Code ที่อ่านได้ ไม่ใช่โค้ดที่ใช้แบ่งปันโปรแกรม</string>
-    <string name="notification_summary_more">มีอีก +%1$d…</string>
     <string name="perms_description_app">จัดให้โดย %1$s</string>
     <string name="swap_cant_find_peers">ไม่เจอคนที่ตามหาหรือ?</string>
     <string name="swap_nearby">แลกเปลี่ยนโปรแกรมกับคนข้างๆ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5f16c847a..e2e0c51f0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -210,7 +210,6 @@
     <string name="less">Daha azı</string>
 
     <string name="back">Geri</string>
-    <string name="notification_summary_more">+%1$d daha…</string>
     <string name="bad_fingerprint">Yanlış parmak izi</string>
     <string name="invalid_url">Bu geçerli bir URL değildir.</string>
     <string name="menu_settings">Ayarlar</string>
@@ -439,8 +438,6 @@
     <string name="notification_content_single_installing">\"%1$s\" kuruluyor…</string>
     <string name="notification_content_single_installed">Başarıyla kuruldu</string>
     <string name="notification_content_single_install_error">Kurulum Başarısız</string>
-    <string name="notification_summary_updates">%1$d Güncelleme</string>
-    <string name="notification_summary_installed">%1$d Uygulama Kuruldu</string>
     <string name="notification_title_summary_update_available">Güncelleme mevcut</string>
     <string name="notification_title_summary_downloading">İndiriliyor…</string>
     <string name="notification_title_summary_downloading_update">Güncelleme indiriliyor…</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5a6ceb3d9..4a233134b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -92,7 +92,6 @@
     <string name="enable">Увімкнути</string>
     <string name="add_key">Додати ключ</string>
     <string name="fdroid_updates_available">F-Droid: доступні оновлення</string>
-    <string name="notification_summary_more">+%1$d більше…</string>
     <string name="send_via_bluetooth">Надіслати через Bluetooth</string>
 
     <string name="menu_share">Поділитися</string>
@@ -449,8 +448,6 @@
     <string name="notification_content_single_installing">Встановлення \"%1$s\"…</string>
     <string name="notification_content_single_installed">Встановлено</string>
     <string name="notification_content_single_install_error">Помилка встановлення</string>
-    <string name="notification_summary_updates">Оновлень: %1$d</string>
-    <string name="notification_summary_installed">Додатків встановлено: %1$d</string>
     <string name="notification_title_summary_update_available">Доступне оновлення</string>
     <string name="notification_title_summary_downloading">Завантаження…</string>
     <string name="notification_title_summary_downloading_update">Завантаження оновлення…</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index c0d64cdb5..0b05958ff 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -178,7 +178,6 @@
     <string name="local_repo_name_summary">Tên kho phần mềm nội bộ của bạn: %s</string>
     <string name="about_source">Mã nguồn</string>
     <string name="app_incompatible">Không tương thích</string>
-    <string name="notification_summary_more">+%1$d ứng dụng khác…</string>
     <string name="invalid_url">Đây không phải là URL hợp lệ.</string>
     <string name="menu_changelog">Lịch sử sửa đổi</string>
     <string name="menu_bitcoin">Bitcoin</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1bb91ae5e..5d7fcd4b1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -156,7 +156,6 @@
     <string name="less">更少</string>
 
     <string name="back">返回</string>
-    <string name="notification_summary_more">+%1$d 更多…</string>
     <string name="send_via_bluetooth">用蓝牙发送</string>
 
     <string name="bad_fingerprint">指纹错误</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c42b36932..6d133ef7e 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -238,7 +238,6 @@
 您不會失去現有的數據，
 已更新的程式亦不需要任何特別的存取權。
 </string>
-    <string name="notification_summary_more">還有 +%1$d 個…</string>
     <string name="next">下一步</string>
     <string name="minsdk_up_to_maxsdk">%1$s 至 %2$s</string>
     <string name="SignatureMismatch">應用程式的新版本使用了不同的鑰匙簽署。若要安裝新版本，
@@ -494,8 +493,6 @@ Android 5.1 或更新的版本。
     <string name="notification_content_single_installing">正在安裝「%1$s」…</string>
     <string name="notification_content_single_installed">安裝成功</string>
     <string name="notification_content_single_install_error">安裝失敗</string>
-    <string name="notification_summary_updates">%1$d 個更新</string>
-    <string name="notification_summary_installed">安裝了 %1$d 應用程式</string>
     <string name="notification_title_summary_update_available">可以更新</string>
     <string name="notification_title_summary_downloading">下載中…</string>
     <string name="notification_title_summary_downloading_update">正在下載更新…</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ea538d23b..f68f461dc 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -258,7 +258,6 @@
     <string name="local_repo_https">使用私密連線</string>
     <string name="repo_error_empty_username">空的使用者名稱，憑證未改變</string>
 
-    <string name="notification_summary_more">+%1$d 更多…</string>
     <string name="repo_exists_enable">此應用軟體倉庫已經設立。確認您要重新啟用它。</string>
     <string name="repo_exists_and_enabled">進入的儲存庫已設立並已啟用。</string>
     <string name="malformed_repo_uri">略過異常的應用軟體倉庫 URI：%s</string>
@@ -423,8 +422,6 @@
     <string name="notification_content_single_installing">正在安裝 \"%1$s\"…</string>
     <string name="notification_content_single_installed">安裝成功</string>
     <string name="notification_content_single_install_error">安裝失敗</string>
-    <string name="notification_summary_updates">%1$d 更新</string>
-    <string name="notification_summary_installed">%1$d 應用程式已安裝</string>
     <string name="notification_title_summary_update_available">可用的更新</string>
     <string name="notification_title_summary_downloading">正在下載…</string>
     <string name="notification_title_summary_downloading_update">正在下載更新…</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d13abfdf..8e89e5709 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -508,7 +508,10 @@
     <string name="crash_dialog_comment_prompt">You can add extra information and comments here:</string>
 
     <!-- notifications -->
-    <string name="notification_summary_more">+%1$d more…</string>
+    <plurals name="notification_summary_more">
+        <item quantity="one">+%1$d more…</item>
+        <item quantity="other">+%1$d more…</item>
+    </plurals>
     <string name="notification_title_single_update_available">Update Available</string>
     <string name="notification_title_single_ready_to_install">Ready to install</string>
     <string name="notification_title_single_ready_to_install_update">Update ready to install</string>
@@ -518,8 +521,14 @@
     <string name="notification_content_single_installing">Installing \"%1$s\"&#8230;</string>
     <string name="notification_content_single_installed">Successfully installed</string>
     <string name="notification_content_single_install_error">Install Failed</string>
-    <string name="notification_summary_updates">%1$d Updates</string>
-    <string name="notification_summary_installed">%1$d Apps Installed</string>
+    <plurals name="notification_summary_updates">
+        <item quantity="one">%1$d Update</item>
+        <item quantity="other">%1$d Updates</item>
+    </plurals>
+    <plurals name="notification_summary_installed">
+        <item quantity="one">%1$d App Installed</item>
+        <item quantity="other">%1$d Apps Installed</item>
+    </plurals>
     <string name="notification_title_summary_update_available">Update available</string>
     <string name="notification_title_summary_downloading">Downloading&#8230;</string>
     <string name="notification_title_summary_downloading_update">Downloading update&#8230;</string>

From 3f125b8e3634aa222e92280f6d8b6e840537e427 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 13 May 2017 00:09:12 +0200
Subject: [PATCH 2/2] For "sk" (Slovak) "many" is not a relevant quantity

---
 app/src/main/res/values-sk/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index c1518c207..0bf23abf9 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -475,7 +475,6 @@
     <plurals name="updates__download_updates_for_apps">
 	<item quantity="one">Stiahnuť aktualizáciu pre %1$d aplikáciu.</item>
 	<item quantity="few">Stiahnuť aktualizácie pre %1$d aplikácie.</item>
-	<item quantity="many">Stiahnuť aktualizácie pre %1$d aplikácií.</item>
 	<item quantity="other">Stiahnuť aktualizácie pre %1$d aplikácií.</item>
 	</plurals>
 
@@ -504,7 +503,6 @@
     <plurals name="button_view_all_apps_in_category">
 	<item quantity="one">Zobraziť %d</item>
 	<item quantity="few">Zobraziť: %d</item>
-	<item quantity="many">Zobraziť. %d</item>
 	<item quantity="other">Zobraziť. %d</item>
 	</plurals>
 
@@ -526,7 +524,6 @@
     <plurals name="details_last_update_days">
 	<item quantity="one">Aktualizované pred %1$s dňom</item>
 	<item quantity="few">Aktualizované pred %1$s dňami</item>
-	<item quantity="many">Aktualizované pred %1$s dňami</item>
 	<item quantity="other">Aktualizované pred %1$s dňami</item>
 	</plurals>
 </resources>