From 675151b4ef0b7443e4c36246326c5a6acf0a1b60 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 18 Jun 2015 19:44:43 -0400
Subject: [PATCH] rename string status_processing_xml to prevent crashes on old
 translations

Thanks to @mvdan for catching that.  Turns out Java's String formatting is
not as tolerant as C's printf().  Java crashes when the format is wrong,
while C just ignores extras.
---
 F-Droid/res/values-ca/strings.xml                |  3 ---
 F-Droid/res/values-de/strings.xml                |  3 ---
 F-Droid/res/values-el/strings.xml                |  3 ---
 F-Droid/res/values-es/strings.xml                |  3 ---
 F-Droid/res/values-fa/strings.xml                |  3 ---
 F-Droid/res/values-fr/strings.xml                |  3 ---
 F-Droid/res/values-gl/strings.xml                |  3 ---
 F-Droid/res/values-hu/strings.xml                |  3 ---
 F-Droid/res/values-it/strings.xml                |  3 ---
 F-Droid/res/values-ja/strings.xml                |  3 ---
 F-Droid/res/values-ko/strings.xml                |  3 ---
 F-Droid/res/values-nb/strings.xml                | 10 ++--------
 F-Droid/res/values-nl/strings.xml                |  3 ---
 F-Droid/res/values-pl/strings.xml                |  1 -
 F-Droid/res/values-pt-rBR/strings.xml            |  3 ---
 F-Droid/res/values-ru/strings.xml                |  3 ---
 F-Droid/res/values-sr/strings.xml                |  3 ---
 F-Droid/res/values-sv/strings.xml                |  3 ---
 F-Droid/res/values-tr/strings.xml                |  3 ---
 F-Droid/res/values-ug/strings.xml                |  3 ---
 F-Droid/res/values-zh-rCN/strings.xml            |  3 ---
 F-Droid/res/values/strings.xml                   |  2 +-
 F-Droid/src/org/fdroid/fdroid/UpdateService.java |  2 +-
 23 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index d909991ef..7851230ea 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -98,9 +98,6 @@ La voleu actualitzar?</string>
   <string name="category_recentlyupdated">S\'ha actualitzat fa poc</string>
   <string name="status_download">S\'està baixant
 %2$s / %3$s (%4$d%%) des de
-%1$s</string>
-  <string name="status_processing_xml">S\'està processant l\'aplicació
-%2$d de %3$d des de
 %1$s</string>
   <string name="status_connecting_to_repo">S\'està connectant a
 %1$s</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index cfb2d0b9c..9d989fd67 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -171,9 +171,6 @@ Sollen diese aktualisiert werden?</string>
   <string name="proxy_port_summary">Konfigurieren Sie Ihren Proxy-Port (z.B. 8818)</string>
   <string name="status_download">Herunterladen
 %2$s / %3$s (%4$d%%) von
-%1$s</string>
-  <string name="status_processing_xml">Anwendung wird vorbereitet
-%2$d / %3$d von
 %1$s</string>
   <string name="status_connecting_to_repo">Mit %1$s
 wird verbunden</string>
diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml
index 13cbf27a0..1129a0120 100644
--- a/F-Droid/res/values-el/strings.xml
+++ b/F-Droid/res/values-el/strings.xml
@@ -123,9 +123,6 @@
   <string name="local_repos_scanning">Αναζήτηση για τοπικά αποθετήρια FDroid…</string>
   <string name="status_download">Λήψη
 %2$s / %3$s (%4$d%%) από
-%1$s</string>
-  <string name="status_processing_xml">Επεξεργασία εφαρμογής
-%2$d από %3$d από
 %1$s</string>
   <string name="status_connecting_to_repo">Σύνδεση με
 %1$s</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 84650bdb7..b40c5be8f 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -170,9 +170,6 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
   <string name="proxy_port_summary">Configurar el número del puerto del proxy (p.ej. 8118)</string>
   <string name="status_download">Descargando
 %2$s / %3$s (%4$d%%) de
-%1$s</string>
-  <string name="status_processing_xml">Procesando la aplicación
-%2$d de %3$d desde
 %1$s</string>
   <string name="status_connecting_to_repo">Conectando a
 %1$s</string>
diff --git a/F-Droid/res/values-fa/strings.xml b/F-Droid/res/values-fa/strings.xml
index 0546cb911..4474ab384 100644
--- a/F-Droid/res/values-fa/strings.xml
+++ b/F-Droid/res/values-fa/strings.xml
@@ -82,9 +82,6 @@
   <string name="category_all">همه</string>
   <string name="status_download">دریافت
 %2$s / %3$s (%4$d%%) از
-%1$s</string>
-  <string name="status_processing_xml">پردازش برنامه
-%2$d از %3$d از
 %1$s</string>
   <string name="status_connecting_to_repo">اتصال به
 %1$s</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 40b29b615..ae83bc254 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -167,9 +167,6 @@ Voulez-vous les mettre à jour?</string>
   <string name="proxy_port_summary">Configurer votre numéro de port de proxy (ex. 8118)</string>
   <string name="status_download">Téléchargement
 %2$s / %3$s (%4$d%%) de
-%1$s</string>
-  <string name="status_processing_xml">Prise en compte de l\'application
-%2$d de %3$d depuis
 %1$s</string>
   <string name="status_connecting_to_repo">Connexion à
 %1$s</string>
diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml
index 0175f1829..c4e3032ea 100644
--- a/F-Droid/res/values-gl/strings.xml
+++ b/F-Droid/res/values-gl/strings.xml
@@ -95,9 +95,6 @@ Quere actualizalos?</string>
   <string name="category_recentlyupdated">Actualizado recentemente</string>
   <string name="status_download">Descargando
 %2$s / %3$s (%4$d%%) desde
-%1$s</string>
-  <string name="status_processing_xml">Procesando o aplicativo
-%2$d de %3$d desde
 %1$s</string>
   <string name="status_connecting_to_repo">Conectándose con
 %1$s</string>
diff --git a/F-Droid/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml
index 8b5f3c9d5..59f1f864b 100644
--- a/F-Droid/res/values-hu/strings.xml
+++ b/F-Droid/res/values-hu/strings.xml
@@ -113,9 +113,6 @@ Szeretné ezeket frissíteni?\"</string>
   <string name="category_recentlyupdated">Legutóbb frissítve</string>
   <string name="status_download">\"Letöltés
 %2$s / %3$s (%4$d%%) innen
-%1$s\"</string>
-  <string name="status_processing_xml">\"Feldolgozási kérelem
-%2$d of %3$d innen
 %1$s\"</string>
   <string name="status_connecting_to_repo">\"Kapcsolódás
 %1$s\"</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index 758a24f8d..cb3aadad0 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -170,9 +170,6 @@ Vuoi aggiornarlo?</string>
   <string name="proxy_port_summary">Configura la porta del tuo proxy (es. 8118)</string>
   <string name="status_download">Scaricamento
 %2$s / %3$s (%4$d%%) da
-%1$s</string>
-  <string name="status_processing_xml">Elaborazione applicazione
-%2$d di %3$d da
 %1$s</string>
   <string name="status_connecting_to_repo">Connessione a
 %1$s</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index db1ea8799..c6e89b9da 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -172,9 +172,6 @@ GNU GPLv3 ﾗｲｾﾝｽに基づいてﾘﾘｰｽされました.</string>
   <string name="proxy_port_summary">ﾌﾟﾛｷｼｰのﾎﾟｰﾄ番号を設定(例:8118)</string>
   <string name="status_download">ﾀﾞｳﾝﾛｰﾄﾞ中
 %2$s / %3$s (%4$d%%) ﾀﾞｳﾝﾛｰﾄﾞ元
-%1$s</string>
-  <string name="status_processing_xml">ｱﾌﾟﾘｹｰｼｮﾝの処理中
-%2$d / %3$d
 %1$s</string>
   <string name="status_connecting_to_repo">接続中
 %1$s</string>
diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml
index 5baeb291d..8b3eba2d6 100644
--- a/F-Droid/res/values-ko/strings.xml
+++ b/F-Droid/res/values-ko/strings.xml
@@ -78,9 +78,6 @@
   <string name="category_recentlyupdated">최근 업데이트</string>
   <string name="status_download">%1$s 에서 다운로드 중입니다.
 %2$s / %3$s (%4$d%%)</string>
-  <string name="status_processing_xml">응용 프로그램 처리중
-%1$s
-%2$d / %3$d</string>
   <string name="status_connecting_to_repo">%1$s에 접속중</string>
   <string name="status_checking_compatibility">장치와 응용프로그램의 호환성 확인중…</string>
   <string name="no_permissions">사용된 권한이 없습니다.</string>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index 6ac15c73d..1559ebb84 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -165,14 +165,8 @@ Lisensiert GNU GPLv3.</string>
   <string name="proxy_host_summary">Sett opp tjenernavn for din mellomtjener (f.eks. 127.0.0.1)</string>
   <string name="proxy_port">Mellomtjener-port</string>
   <string name="proxy_port_summary">Sett opp portnummer for din mellomtjener (f.eks. 8118)</string>
-  <string name="status_download">Laster ned
-%2$s / %3$s (%4$d%%) fra
-%1$s</string>
-  <string name="status_processing_xml">Prosesserer applikasjon
-%2$d of %3$d fra
-%1$s</string>
-  <string name="status_connecting_to_repo">Kobler til
-%1$s</string>
+  <string name="status_download">Laster ned\n%2$s / %3$s (%4$d%%) fra\n%1$s</string>
+  <string name="status_connecting_to_repo">Kobler til\n%1$s</string>
   <string name="status_checking_compatibility">Sjekker programstøtte for ditt utstyr…</string>
   <string name="status_inserting">Lagrer programdata (%1$d%%)</string>
   <string name="repos_unchanged">Ingen av pakkebrønnene hadde noen oppdateringer</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 2be53666c..495cb9a79 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -124,9 +124,6 @@ Wilt u ze vernieuwen?</string>
   <string name="local_repos_title">Lokale FDroid opslagplaatsen</string>
   <string name="status_download">Downloaden
 %2$s / %3$s (%4$d%%) van
-%1$s</string>
-  <string name="status_processing_xml">Verwerken applicatie
-%2$d van %3$d van
 %1$s</string>
   <string name="status_connecting_to_repo">Verbinden met %1$s</string>
   <string name="status_checking_compatibility">Controleer app compatibiliteit met uw apparaat…</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index fca30577e..eee271076 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -129,7 +129,6 @@ Czy chcesz je zaktualizować?</string>
   <string name="proxy_host_summary">Skonfiguruj host proxy</string>
   <string name="proxy_port">Port proxy</string>
   <string name="proxy_port_summary">Skonfiguruj port proxy</string>
-  <string name="status_processing_xml">Przetwarzanie aplikacji %2$d / %3$d z %1$s</string>
   <string name="status_connecting_to_repo">Trwa łączenie z
 %1$s</string>
   <string name="status_checking_compatibility">Sprawdzanie kompatybilności aplikacji z urządzeniem…</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index 282342faf..9548ea21a 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -138,9 +138,6 @@ Você deseja atualizá-los?</string>
   <string name="proxy_port_summary">Configurar o número da porta do seu proxy (ex. 8118)</string>
   <string name="status_download">Baixando
 %2$s / %3$s (%4$d%%) de 
-%1$s</string>
-  <string name="status_processing_xml">Processando aplicativo
-%2$d de %3$d, de 
 %1$s</string>
   <string name="status_connecting_to_repo">Conectando-se a
 %1$s</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index 955d42a06..6487c539a 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -171,9 +171,6 @@
   <string name="proxy_port_summary">Настройка номера порта вашего прокси (напр. 8118)</string>
   <string name="status_download">Загрузка
 %2$s / %3$s (%4$d%%) из
-%1$s</string>
-  <string name="status_processing_xml">Обработка приложения
-%2$d из %3$d от
 %1$s</string>
   <string name="status_connecting_to_repo">Соединение с
 %1$s</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index 038a8d28d..c8b85e627 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -169,9 +169,6 @@
   <string name="proxy_port_summary">Подесите порт вашег проксија (нпр. 8118)</string>
   <string name="status_download">Преузимам
 %2$s / %3$s (%4$d%%) са
-%1$s</string>
-  <string name="status_processing_xml">Обрађујем апликацију
-%2$d од %3$d са
 %1$s</string>
   <string name="status_connecting_to_repo">Повезујем се са
 %1$s</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index 15d0ec554..9e71591b0 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -170,9 +170,6 @@ Vill du uppdatera dem?</string>
   <string name="proxy_port_summary">Konfigurera din proxys portnummer (t.ex. 8118)</string>
   <string name="status_download">Hämtar
 %2$s / %3$s (%4$d%%) från
-%1$s</string>
-  <string name="status_processing_xml">Bearbetar program
-%2$d av %3$d från
 %1$s</string>
   <string name="status_connecting_to_repo">Ansluter till
 %1$s</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index d79101f59..aebaa0d88 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -153,9 +153,6 @@ Güncellemek ister misiniz?</string>
   <string name="proxy_port_summary">Proxy port numarasını yapılandır (örn. 8118)</string>
   <string name="status_download">İndiriliyor
 %2$s / %3$s (%4$d%%) şuradan
-%1$s</string>
-  <string name="status_processing_xml">Uygulama ele alınıyor
-%2$d toplam %3$d şuradan
 %1$s</string>
   <string name="status_connecting_to_repo">%1$s konumuna
 bağlanılıyor</string>
diff --git a/F-Droid/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml
index 0b1921925..0cf70f83d 100644
--- a/F-Droid/res/values-ug/strings.xml
+++ b/F-Droid/res/values-ug/strings.xml
@@ -91,9 +91,6 @@
   <string name="category_recentlyupdated">يېقىنقى يېڭىلانغانلار</string>
   <string name="status_download">چۈشۈرۈۋاتىدۇ
 %2$s / %3$s (%4$d%%)
-%1$s</string>
-  <string name="status_processing_xml">ئەپنى بىر تەرەپ قىلىۋاتىدۇ
-%2$d of %3$d
 %1$s</string>
   <string name="status_connecting_to_repo">%1$s غا 
 باغلىنىۋاتىدۇ</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index be9385e8a..d9cd34c5f 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -140,9 +140,6 @@ https://f-droid.org/repo</string>
   <string name="status_download">正在从以下位置下载：
 %1$s
 进度：%2$s / %3$s (%4$d%%)</string>
-  <string name="status_processing_xml">正在处理以下位置的应用程序：
-%1$s
-进度：%2$d / %3$d</string>
   <string name="status_connecting_to_repo">正在连接到
 %1$s</string>
   <string name="status_checking_compatibility">正在检查应用程序与您的设备的兼容性…</string>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 21fd192b0..f6e316951 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -211,7 +211,7 @@
 	  - Percentage complete (int between 0-100)
 	-->
 	<string name="status_download">Downloading\n%2$s / %3$s (%4$d%%) from\n%1$s</string>
-	<string name="status_processing_xml">Processing\n%2$s / %3$s (%4$d%%) from\n%1$s</string>
+	<string name="status_processing_xml_percent">Processing %2$s / %3$s (%4$d%%) from %1$s</string>
 	<string name="status_connecting_to_repo">Connecting to\n%1$s</string>
 	<string name="status_checking_compatibility">Checking apps compatibility with your device…</string>
     <string name="status_inserting">Saving application details (%1$d%%)</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index b4dc635d8..ec63a7d49 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -787,7 +787,7 @@ public class UpdateService extends IntentService implements ProgressListener {
                 message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent);
                 break;
             case RepoUpdater.PROGRESS_TYPE_PROCESS_XML:
-                message = getString(R.string.status_processing_xml, repoAddress, downloadedSize, totalSize, percent);
+                message = getString(R.string.status_processing_xml_percent, repoAddress, downloadedSize, totalSize, percent);
                 break;
         }
         sendStatus(STATUS_INFO, message);