Merge pull request #791 from mfietz/issue/760-cancel-download

Cancel Auto Downloads

24 files changed, 25 insertions, 24 deletions

diff --git a/core/src/main/res/values-az/strings.xml b/core/src/main/res/values-az/strings.xml
index 9640412c1..b52ecf4a4 100644
--- a/core/src/main/res/values-az/strings.xml
+++ b/core/src/main/res/values-az/strings.xml
@@ -76,7 +76,7 @@
   <string name="download_error_connection_error">Əlaqə xətasi</string>
   <string name="download_error_unknown_host">Naməlum xost</string>
   <string name="cancel_all_downloads_label">Yükləmələrin hamısını ləğv et</string>
-  <string name="download_cancelled_msg">Yükləmə ləğv olundu</string>
+  <string name="download_canceled_msg">Yükləmə ləğv olundu</string>
   <string name="download_report_title">Yükləmə başa çatdı</string>
   <string name="download_error_malformed_url">Yanlış URL</string>
   <string name="download_error_io_error">IO xətasi</string>
diff --git a/core/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml
index 0fe3ae415..be7a73e6d 100644
--- a/core/src/main/res/values-ca/strings.xml
+++ b/core/src/main/res/values-ca/strings.xml
@@ -108,7 +108,7 @@
   <string name="download_error_unknown_host">Amfitrió desconegut</string>
   <string name="download_error_unauthorized">Error d\'autenticació</string>
   <string name="cancel_all_downloads_label">Cancel·la totes les baixades</string>
-  <string name="download_cancelled_msg">S\'ha cancel·lat la baixada</string>
+  <string name="download_canceled_msg">S\'ha cancel·lat la baixada</string>
   <string name="download_report_title">Baixades completades</string>
   <string name="download_error_malformed_url">URL mal formatada</string>
   <string name="download_error_io_error">Error d\'E/S</string>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index a67a6d10b..661faefbe 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -108,7 +108,7 @@
   <string name="download_error_unknown_host">Neznámý host</string>
   <string name="download_error_unauthorized">Chyba přihlášení</string>
   <string name="cancel_all_downloads_label">Zrušit všechna stahování</string>
-  <string name="download_cancelled_msg">Stahování zrušeno</string>
+  <string name="download_canceled_msg">Stahování zrušeno</string>
   <string name="download_report_title">Všechna stahování dokončena</string>
   <string name="download_error_malformed_url">Chybné URL</string>
   <string name="download_error_io_error">IO chyba</string>
diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
index d31c65614..ba7fafca6 100644
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@@ -108,7 +108,7 @@
   <string name="download_error_unknown_host">Ukendt vært</string>
   <string name="download_error_unauthorized">Godkendelses fejl</string>
   <string name="cancel_all_downloads_label">Annuller alle downloads</string>
-  <string name="download_cancelled_msg">Download afbrudt</string>
+  <string name="download_canceled_msg">Download afbrudt</string>
   <string name="download_report_title">Downloads afsluttet</string>
   <string name="download_error_malformed_url">Misdannet URL</string>
   <string name="download_error_io_error">IO fejl</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 1f1b519ab..f2d0a66ad 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Unbekannter Host</string>
   <string name="download_error_unauthorized">Authentifizierungsfehler</string>
   <string name="cancel_all_downloads_label">Alle Downloads abbrechen</string>
-  <string name="download_cancelled_msg">Download abgebrochen</string>
+  <string name="download_canceled_msg">Download abgebrochen</string>
   <string name="download_report_title">Download abgeschlossen</string>
   <string name="download_error_malformed_url">Fehler in URL</string>
   <string name="download_error_io_error">E/A Error</string>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 48ff1570b..d05c34876 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -72,7 +72,7 @@
   <string name="download_error_connection_error">Error de conexión</string>
   <string name="download_error_unknown_host">Host desconocido</string>
   <string name="cancel_all_downloads_label">Cancelar todas las descargas</string>
-  <string name="download_cancelled_msg">Descarga cancelada</string>
+  <string name="download_canceled_msg">Descarga cancelada</string>
   <string name="download_report_title">Descargas completadas</string>
   <string name="download_error_malformed_url">URL malformada</string>
   <string name="download_error_io_error">Error de E/S</string>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index 2dbe4e8d4..eb1d1631b 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Host desconocido</string>
   <string name="download_error_unauthorized">Error de autenticación</string>
   <string name="cancel_all_downloads_label">Cancelar todas las descargas</string>
-  <string name="download_cancelled_msg">Descarga cancelada</string>
+  <string name="download_canceled_msg">Descarga cancelada</string>
   <string name="download_report_title">Descargas completadas</string>
   <string name="download_error_malformed_url">URL con formato incorrecto</string>
   <string name="download_error_io_error">Error de E/S</string>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index 617df3f8f..141b84bf7 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Hôte inconnu</string>
   <string name="download_error_unauthorized">Erreur d\'authentification</string>
   <string name="cancel_all_downloads_label">Annuler tous les téléchargements</string>
-  <string name="download_cancelled_msg">Téléchargement annulé</string>
+  <string name="download_canceled_msg">Téléchargement annulé</string>
   <string name="download_report_title">Téléchargements terminés</string>
   <string name="download_error_malformed_url">URL incorrecte</string>
   <string name="download_error_io_error">Erreur d\'E/S</string>
diff --git a/core/src/main/res/values-hi-rIN/strings.xml b/core/src/main/res/values-hi-rIN/strings.xml
index 7a43ba15b..f32c7c02f 100644
--- a/core/src/main/res/values-hi-rIN/strings.xml
+++ b/core/src/main/res/values-hi-rIN/strings.xml
@@ -91,7 +91,7 @@
   <string name="download_error_connection_error">कनेक्शन त्रुटि</string>
   <string name="download_error_unknown_host">अज्ञात होस्ट</string>
   <string name="cancel_all_downloads_label">सभी डाउनलोड रद्द  करें</string>
-  <string name="download_cancelled_msg">डाउनलोड रद्द</string>
+  <string name="download_canceled_msg">डाउनलोड रद्द</string>
   <string name="download_report_title">डाउनलोड पूरा हो गया है</string>
   <string name="download_error_malformed_url">गलत URL</string>
   <string name="download_error_io_error">आईओ त्रुटि</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 69bab7326..361657b6b 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -109,7 +109,7 @@
   <string name="download_error_unknown_host">Host sconosciuto</string>
   <string name="download_error_unauthorized">Errore di autenticazione</string>
   <string name="cancel_all_downloads_label">Annulla tutti i download</string>
-  <string name="download_cancelled_msg">Download annullato</string>
+  <string name="download_canceled_msg">Download annullato</string>
   <string name="download_report_title">Download completati</string>
   <string name="download_error_malformed_url">URL malformato</string>
   <string name="download_error_io_error">Errore IO</string>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index b52bb4144..9e9c0e6bc 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">שרת לא ידוע</string>
   <string name="download_error_unauthorized">שגיאת אימות</string>
   <string name="cancel_all_downloads_label">בטל את כל ההורדות</string>
-  <string name="download_cancelled_msg">הורדה בוטלה</string>
+  <string name="download_canceled_msg">הורדה בוטלה</string>
   <string name="download_report_title">הורדות הושלמו</string>
   <string name="download_error_malformed_url">כתובת אתר שגויה</string>
   <string name="download_error_io_error">שגיאת קלט פלט</string>
diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
index df73db23e..9021b2b42 100644
--- a/core/src/main/res/values-ja/strings.xml
+++ b/core/src/main/res/values-ja/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">ホスト不明</string>
   <string name="download_error_unauthorized">認証エラー</string>
   <string name="cancel_all_downloads_label">すべてのダウンロードをキャンセル</string>
-  <string name="download_cancelled_msg">ダウンロードをキャンセルしました</string>
+  <string name="download_canceled_msg">ダウンロードをキャンセルしました</string>
   <string name="download_report_title">ダウンロードが完了しました</string>
   <string name="download_error_malformed_url">不正な形式のURL</string>
   <string name="download_error_io_error">IOエラー</string>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 7132031e4..7830be329 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">알 수 없는 호스트</string>
   <string name="download_error_unauthorized">인증 오류</string>
   <string name="cancel_all_downloads_label">모든 다운로드 취소</string>
-  <string name="download_cancelled_msg">다운로드 취소됨</string>
+  <string name="download_canceled_msg">다운로드 취소됨</string>
   <string name="download_report_title">다운로드 마침</string>
   <string name="download_error_malformed_url">URL 형식 틀림</string>
   <string name="download_error_io_error">입출력 오류</string>
diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
index 66ffaaf87..0f447d54a 100644
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@@ -86,7 +86,7 @@
   <string name="download_error_unknown_host">Onbekende host</string>
   <string name="download_error_unauthorized">Authenticatie fout</string>
   <string name="cancel_all_downloads_label">Alle downloads annuleren</string>
-  <string name="download_cancelled_msg">Download geannuleerd</string>
+  <string name="download_canceled_msg">Download geannuleerd</string>
   <string name="download_report_title">Downloads afgerond</string>
   <string name="download_error_malformed_url">Misvormde URL</string>
   <string name="download_error_io_error">IO fout</string>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 6e5c2ce44..ba1a0bb91 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -108,7 +108,7 @@
   <string name="download_error_unknown_host">Nieznany host</string>
   <string name="download_error_unauthorized">Błąd autoryzacji</string>
   <string name="cancel_all_downloads_label">Anuluj wszystkie pobierania</string>
-  <string name="download_cancelled_msg">Pobieranie anulowane</string>
+  <string name="download_canceled_msg">Pobieranie anulowane</string>
   <string name="download_report_title">Pobieranie ukończone</string>
   <string name="download_error_malformed_url">Niepoprawny adres</string>
   <string name="download_error_io_error">Błąd wejścia/wyjścia</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index aba186c1a..c3523acfb 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -85,7 +85,7 @@
   <string name="download_error_connection_error">Erro de conexão</string>
   <string name="download_error_unknown_host">Host desconhecido</string>
   <string name="cancel_all_downloads_label">Cancelar todos os downloads</string>
-  <string name="download_cancelled_msg">Download cancelado</string>
+  <string name="download_canceled_msg">Download cancelado</string>
   <string name="download_report_title">Downloads finalizados</string>
   <string name="download_error_malformed_url">URL inválida</string>
   <string name="download_error_io_error">Erro de IO</string>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index 9ef8474ee..d9e201e21 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Servidor desconhecido</string>
   <string name="download_error_unauthorized">Erro de autenticação</string>
   <string name="cancel_all_downloads_label">Cancelar transferências</string>
-  <string name="download_cancelled_msg">Transferência cancelada</string>
+  <string name="download_canceled_msg">Transferência cancelada</string>
   <string name="download_report_title">Transferências terminadas</string>
   <string name="download_error_malformed_url">URL inválido</string>
   <string name="download_error_io_error">Erro I/O</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 7bfb99f9d..390f50767 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -80,7 +80,7 @@
   <string name="download_error_connection_error">Eroare de conexiune</string>
   <string name="download_error_unknown_host">Host necunoscut</string>
   <string name="cancel_all_downloads_label">Anulează toate descărcările</string>
-  <string name="download_cancelled_msg">Descărcare anulată</string>
+  <string name="download_canceled_msg">Descărcare anulată</string>
   <string name="download_report_title">Descărcări terminate</string>
   <string name="download_error_malformed_url">URL malformat</string>
   <string name="download_error_io_error">Eroare IO</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index e08e40e56..187a92861 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Неизвестный узел</string>
   <string name="download_error_unauthorized">Ошибка авторизации</string>
   <string name="cancel_all_downloads_label">Отменить все загрузки</string>
-  <string name="download_cancelled_msg">Загрузка отменена</string>
+  <string name="download_canceled_msg">Загрузка отменена</string>
   <string name="download_report_title">Загрузки завершены</string>
   <string name="download_error_malformed_url">Неправильный адрес</string>
   <string name="download_error_io_error">Ошибка ввода-вывода</string>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 4e468c1e1..e70ca5d3f 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Okänd värd</string>
   <string name="download_error_unauthorized">Autentiseringsproblem</string>
   <string name="cancel_all_downloads_label">Avbryt alla nedladdningar</string>
-  <string name="download_cancelled_msg">Nedladdning avbruten</string>
+  <string name="download_canceled_msg">Nedladdning avbruten</string>
   <string name="download_report_title">Nedladdningar färdiga</string>
   <string name="download_error_malformed_url">Felaktig webbadress</string>
   <string name="download_error_io_error">IO fel</string>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index 265a9025c..e83c9b48e 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Bilinmeyen sunucu</string>
   <string name="download_error_unauthorized">Yetkilendirme hatası</string>
   <string name="cancel_all_downloads_label">Bütün indirmeleri iptal et</string>
-  <string name="download_cancelled_msg">İndirme iptal edildi</string>
+  <string name="download_canceled_msg">İndirme iptal edildi</string>
   <string name="download_report_title">İndirme tamamlandı</string>
   <string name="download_error_malformed_url">Bozuk URL</string>
   <string name="download_error_io_error">G/Ç Hatası</string>
diff --git a/core/src/main/res/values-uk-rUA/strings.xml b/core/src/main/res/values-uk-rUA/strings.xml
index 1602e6253..20374232a 100644
--- a/core/src/main/res/values-uk-rUA/strings.xml
+++ b/core/src/main/res/values-uk-rUA/strings.xml
@@ -112,7 +112,7 @@
   <string name="download_error_unknown_host">Невідомий host</string>
   <string name="download_error_unauthorized">Помилка автентифікації</string>
   <string name="cancel_all_downloads_label">Скасувати всі завантаження</string>
-  <string name="download_cancelled_msg">Відмінено завантаження</string>
+  <string name="download_canceled_msg">Відмінено завантаження</string>
   <string name="download_report_title">Завантажили</string>
   <string name="download_error_malformed_url">Невірний URL</string>
   <string name="download_error_io_error">Помилка IO</string>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index d857ea194..0a2b9355e 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -103,7 +103,7 @@
   <string name="download_error_unknown_host">未知主机</string>
   <string name="download_error_unauthorized">认证错误</string>
   <string name="cancel_all_downloads_label">取消所有下载</string>
-  <string name="download_cancelled_msg">已取消下载</string>
+  <string name="download_canceled_msg">已取消下载</string>
   <string name="download_report_title">下载完成</string>
   <string name="download_error_malformed_url">畸形 URL</string>
   <string name="download_error_io_error">IO 错误</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 14222be56..4044f8951 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -128,7 +128,8 @@
     <string name="download_error_unknown_host">Unknown host</string>
     <string name="download_error_unauthorized">Authentication error</string>
     <string name="cancel_all_downloads_label">Cancel all downloads</string>
-    <string name="download_cancelled_msg">Download cancelled</string>
+    <string name="download_canceled_msg">Download canceled</string>
+    <string name="download_canceled_autodownload_enabled_msg">Download canceled\nDisabled <i>Auto Download</i> for this item</string>
     <string name="download_report_title">Downloads completed with error(s)</string>
     <string name="download_report_content_title">Download report</string>
     <string name="download_error_malformed_url">Malformed URL</string>