Browse Source

lint: use sync_foreign_files_forgotten_content as plurals aware string

AndyScherzinger 7 years ago
parent
commit
4bbf6a66bd
38 changed files with 25 additions and 41 deletions
  1. 21 4
      src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
  2. 0 1
      src/main/res/values-ar/strings.xml
  3. 0 1
      src/main/res/values-ast/strings.xml
  4. 0 1
      src/main/res/values-bg-rBG/strings.xml
  5. 0 1
      src/main/res/values-ca/strings.xml
  6. 0 1
      src/main/res/values-cs-rCZ/strings.xml
  7. 0 1
      src/main/res/values-da/strings.xml
  8. 0 1
      src/main/res/values-de-rDE/strings.xml
  9. 0 1
      src/main/res/values-de/strings.xml
  10. 0 1
      src/main/res/values-el/strings.xml
  11. 0 1
      src/main/res/values-en-rGB/strings.xml
  12. 0 1
      src/main/res/values-es-rAR/strings.xml
  13. 0 1
      src/main/res/values-es-rMX/strings.xml
  14. 0 1
      src/main/res/values-es/strings.xml
  15. 0 1
      src/main/res/values-fi-rFI/strings.xml
  16. 0 1
      src/main/res/values-fr/strings.xml
  17. 0 1
      src/main/res/values-he/strings.xml
  18. 0 1
      src/main/res/values-hu-rHU/strings.xml
  19. 0 1
      src/main/res/values-id/strings.xml
  20. 0 1
      src/main/res/values-is/strings.xml
  21. 0 1
      src/main/res/values-it/strings.xml
  22. 0 1
      src/main/res/values-ja-rJP/strings.xml
  23. 0 1
      src/main/res/values-ko/strings.xml
  24. 0 1
      src/main/res/values-lv/strings.xml
  25. 0 1
      src/main/res/values-nb-rNO/strings.xml
  26. 0 1
      src/main/res/values-pl/strings.xml
  27. 0 1
      src/main/res/values-pt-rBR/strings.xml
  28. 0 1
      src/main/res/values-ro/strings.xml
  29. 0 1
      src/main/res/values-ru/strings.xml
  30. 0 1
      src/main/res/values-sk-rSK/strings.xml
  31. 0 1
      src/main/res/values-sl/strings.xml
  32. 0 1
      src/main/res/values-sq/strings.xml
  33. 0 1
      src/main/res/values-sr/strings.xml
  34. 0 1
      src/main/res/values-sv/strings.xml
  35. 0 1
      src/main/res/values-tr/strings.xml
  36. 0 1
      src/main/res/values-zh-rCN/strings.xml
  37. 0 1
      src/main/res/values-zh-rTW/strings.xml
  38. 4 1
      src/main/res/values/strings.xml

+ 21 - 4
src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -33,6 +33,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
+import android.support.annotation.PluralsRes;
 import android.support.v4.app.NotificationCompat;
 
 import com.owncloud.android.R;
@@ -443,7 +444,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     getContext(), (int) System.currentTimeMillis(), new Intent(), 0
                 ))
                 .setContentTitle(i18n(R.string.sync_fail_in_favourites_ticker))
-                .setContentText(getContext().getResources().getQuantityString(
+                .setContentText(getQuantityString(
                     R.plurals.sync_fail_in_favourites_content,
                     mFailedResultsCounter,
                     mFailedResultsCounter + mConflictsFound, mConflictsFound
@@ -498,8 +499,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 getContext(), (int) System.currentTimeMillis(), explanationIntent, 0
             ))
             .setContentTitle(i18n(R.string.sync_foreign_files_forgotten_ticker))
-            .setContentText(i18n(R.string.sync_foreign_files_forgotten_content,
-                    mForgottenLocalFiles.size(), i18n(R.string.app_name)));
+            .setContentText(getQuantityString(
+                    R.plurals.sync_foreign_files_forgotten_content,
+                    mForgottenLocalFiles.size(),
+                    mForgottenLocalFiles.size(),
+                    i18n(R.string.app_name))
+            );
         
         showNotification(R.string.sync_foreign_files_forgotten_ticker, notificationBuilder);
     }
@@ -507,7 +512,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     /**
      * Creates a notification builder with some commonly used settings
      * 
-     * @return
+     * @return notification builder
      */
     private NotificationCompat.Builder createNotificationBuilder() {
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
@@ -536,4 +541,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private String i18n(int key, Object... args) {
         return getContext().getString(key, args);
     }
+
+    /**
+     * Shorthand plurals translation.
+     *
+     * @param id         The desired plurals identifier.
+     * @param quantity   The number used to get the correct string for the current language's plural rules.
+     * @param formatArgs The format arguments that will be used for substitution.
+     * @return formatted, plurals respecting string
+     */
+    private String getQuantityString(@PluralsRes int id, int quantity, Object... formatArgs) {
+        return getContext().getResources().getQuantityString(id, quantity, formatArgs);
+    }
 }

+ 0 - 1
src/main/res/values-ar/strings.xml

@@ -148,7 +148,6 @@
     <string name="sync_conflicts_in_favourites_ticker">هناك تعارض</string>
     <string name="sync_fail_in_favourites_ticker">لم تنجح المزامنة التلقائية للملفات</string>
     <string name="sync_foreign_files_forgotten_ticker">تم نسيان بعض الملفات المحلية</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d لا يمكن نسخها داخل المجلد %2$s الملفات الخارجه من المجلد</string>
     <string name="foreign_files_local_text">محلّي : %1$s</string>
     <string name="foreign_files_remote_text">عن بعد : %1$s</string>
     <string name="pass_code_enter_pass_code">إدخل رمزك السري من فضلك</string>

+ 0 - 1
src/main/res/values-ast/strings.xml

@@ -149,7 +149,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Conflictos alcontraos</string>
     <string name="sync_fail_in_favourites_ticker">Fallu al caltener ficheros sincronizaos.</string>
     <string name="sync_foreign_files_forgotten_ticker">Dexáronse dalgunos ficheros llocales.</string>
-    <string name="sync_foreign_files_forgotten_content">Los ficheros %1$d fuera de la carpeta %2$s nun puen copiase dientro</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s yá nun esiste</string>
     <string name="pass_code_enter_pass_code">Introduz el to códigu de pasu, por favor</string>
     

+ 0 - 1
src/main/res/values-bg-rBG/strings.xml

@@ -142,7 +142,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Открити са конфликти</string>
     <string name="sync_fail_in_favourites_ticker">Неуспешни Kept-in-sync файлове</string>
     <string name="sync_foreign_files_forgotten_ticker">Някои локални файлове бяха забравени.</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d файла от %2$s папки не могат да бъдат копирани</string>
     <string name="pass_code_enter_pass_code">Моля, въведете кода за достъп</string>
     
     <string name="pass_code_configure_your_pass_code">Въведете кода за достъп</string>

+ 0 - 1
src/main/res/values-ca/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">S\'han trobat conflictes</string>
     <string name="sync_fail_in_favourites_ticker">Han fallat fitxers que han d\'estar sincronitzats</string>
     <string name="sync_foreign_files_forgotten_ticker">S\'han oblidat alguns fitxers locals</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d fitxers no s\'han pogut copiar dins de la carpeta %2$s</string>
     <string name="sync_current_folder_was_removed">La carpeta%1$s ja no existeix</string>
     <string name="upload_query_move_foreign_files">L\'espai insuficient evita la còpia dels fitxers seleccionats a la carpeta.%1$s Voleu allunyar-los aquí?</string>
     <string name="pass_code_enter_pass_code">Escriviu el codi d\'accés</string>

+ 0 - 1
src/main/res/values-cs-rCZ/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Nalezeny konflikty</string>
     <string name="sync_fail_in_favourites_ticker">Automatická synchronizace souborů selhala</string>
     <string name="sync_foreign_files_forgotten_ticker">Některé místní soubory byly zapomenuty</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d souborů z %2$s adresáře se nepodařilo zkopírovat do</string>
     <string name="sync_current_folder_was_removed">Adresář %1$s již neexistuje</string>
     <string name="foreign_files_move">Přesunout vše</string>
     <string name="foreign_files_success">Všechny soubory byly přesunuty</string>

+ 0 - 1
src/main/res/values-da/strings.xml

@@ -150,7 +150,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflikter fundet</string>
     <string name="sync_fail_in_favourites_ticker">Hold-synkroniseret filer mislykkedes</string>
     <string name="sync_foreign_files_forgotten_ticker">Visse lokale filer blev glemt</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d filer ud af %2$s mappe kunne ikke kopieres ind i</string>
     <string name="pass_code_enter_pass_code">Indtast venligst din adgangskode</string>
     
     <string name="pass_code_configure_your_pass_code">Angiv din passcode</string>

+ 0 - 1
src/main/res/values-de-rDE/strings.xml

@@ -188,7 +188,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
     <string name="sync_fail_in_favourites_ticker">Synchronhalten schlug fehl.</string>
     <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem %2$s Verzeichnis konnten nicht kopiert werden nach</string>
     <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Konto-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert hat. Die Datei(en) können entweder wie sie sind belassen und den Link zu %3$s entfernt werden oder die Datei(en) in den Ordner %1$s verschoben und den Link zu %4$s beibehalten werden.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
     <string name="sync_current_folder_was_removed">Der Ordner %1$s existiert nicht mehr</string>
     <string name="foreign_files_move">Alle verschieben</string>

+ 0 - 1
src/main/res/values-de/strings.xml

@@ -188,7 +188,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
     <string name="sync_fail_in_favourites_ticker">Synchronhalten schlug fehl.</string>
     <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem %2$s Verzeichnis konnten nicht kopiert werden nach</string>
     <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Konto-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert hat. Die Datei(en) können entweder wie sie sind belassen und den Link zu %3$s entfernt werden oder die Datei(en) in den Ordner %1$s verschoben und den Link zu %4$s beibehalten werden.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
     <string name="sync_current_folder_was_removed">Der Ordner %1$s existiert nicht mehr</string>
     <string name="foreign_files_move">Verschiebe alle</string>

+ 0 - 1
src/main/res/values-el/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Βρέθηκαν διενέξεις</string>
     <string name="sync_fail_in_favourites_ticker">Τα αρχεία σε αναμονή προς συγχρονισμού απέτυχαν</string>
     <string name="sync_foreign_files_forgotten_ticker">Ορισμένα τοπικά αρχεία ξεχάστηκαν</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d αρχεία από τον %2$s φάκελο δεν ήταν δυνατό να αντιγραφούν σε</string>
     <string name="sync_current_folder_was_removed">Ο φάκελος %1$s δεν υπάρχει πια</string>
     <string name="upload_query_move_foreign_files">Δεν υπάρχει αρκετός διαθέσιμος αποθηκευτικός χώρος για να αντιγραφούν τα επιλεγμένα αρχεία στον φάκελο %1$s. Θα θέλατε να τα μετακινήσετε αντί αυτού;</string>
     <string name="pass_code_enter_pass_code">Παρακαλούμε εισάγετε τον κωδικό πρόσβασης</string>

+ 0 - 1
src/main/res/values-en-rGB/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s folder could not be copied into</string>
     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded with earlier versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and delete the link to %3$s, or move the file(s) into the %1$s folder and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.</string>
     <string name="sync_current_folder_was_removed">The folder %1$s does not exist anymore</string>
     <string name="foreign_files_move">Move all</string>

+ 0 - 1
src/main/res/values-es-rAR/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
     <string name="sync_fail_in_favourites_ticker">Falla en archivos mantenidos-en-sincronización.</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d archivos de la carpeta %2$s no pudieron ser copiadas</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Le gustaría moverlos ahí en su lugar?</string>
     <string name="pass_code_enter_pass_code">Favor de ingresar su código de seguridad</string>

+ 0 - 1
src/main/res/values-es-rMX/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
     <string name="sync_fail_in_favourites_ticker">Falla en archivos mantenidos-en-sincronización.</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d archivos de la carpeta %2$s no pudieron ser copiadas</string>
     <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos cargados desde este dispositivo serán copiados a la carpeta local %1$spara prevenir perdidas de datos cuando un archivo se sincroniza entre múltiples cuentas. \n\nDerivado de este cambio, todos los archivos cargados con versiones anteriores de la aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error evitó que se completara esta operación durante la sincronizacion de la cuenta. Puedes dejar el(los) archivo(s) como está(n) y eliminar la liga a %3$s, o bien, mover el(los) archivo(s) a la carpeta%1$s y mantener la liga a %4$s.\n\nSe enlistan a continuación los archivos locales así como los archivos remotos en %5$s a donde estaban ligados</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="foreign_files_move">Mover todos</string>

+ 0 - 1
src/main/res/values-es/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Se han encontrado conflictos</string>
     <string name="sync_fail_in_favourites_ticker">Fallos en la sincronización de contenidos</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han ignorado</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d archivos en la carpeta %2$s no se han podido copiar a</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. En su lugar, ¿le gustaría moverlos?</string>
     <string name="pass_code_enter_pass_code">Por favor introduzca su código de acceso</string>

+ 0 - 1
src/main/res/values-fi-rFI/strings.xml

@@ -163,7 +163,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Ristiriitoja löytynyt</string>
     <string name="sync_fail_in_favourites_ticker">\"Pidä synkronoituna\" epäonnistui</string>
     <string name="sync_foreign_files_forgotten_ticker">Jotkin paikalliset tiedostot unohtuivat</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d / %2$s tiedostoa ei voitu kopioida</string>
     <string name="sync_current_folder_was_removed">Kansiota %1$s ei ole enää olemassa</string>
     <string name="foreign_files_move">Siirrä kaikki</string>
     <string name="foreign_files_success">Kaikki tiedostot siirrettiin</string>

+ 0 - 1
src/main/res/values-fr/strings.xml

@@ -189,7 +189,6 @@ Attention la suppression est irréversible.</string>
     <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
     <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
     <string name="sync_foreign_files_forgotten_ticker">Certains fichiers locaux ont été ignorés</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d fichiers du dossier %2$s n\'ont pas pu être copiés dans</string>
     <string name="sync_foreign_files_forgotten_explanation">Depuis la version 1.3.16, les fichiers envoyés depuis cet appareil sont copiés dans le dossier local %1$s pour éviter une perte de données lorsqu\'un même fichier est synchronisé avec plusieurs comptes.\n\nEn raison de cette modification, tous les fichiers envoyés avec des versions antérieures de cette application ont été copiés dans le dossier %2$s. Cependant, une erreur a empêché l\'achèvement de cette opération pendant la synchronisation du compte. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien vers %3$s, soit déplacer les fichiers dans le dossier %1$s et garder le lien vers %4$s.\n\nCi-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxquels ils étaient liés.</string>
     <string name="sync_current_folder_was_removed">Le dossier %1$s n\'existe plus</string>
     <string name="foreign_files_move">Tout déplacer</string>

+ 0 - 1
src/main/res/values-he/strings.xml

@@ -131,7 +131,6 @@
     <string name="sync_conflicts_in_favourites_ticker">נמצאו התנגשויות</string>
     <string name="sync_fail_in_favourites_ticker">קבצים שהוגדרו לסנכרון נכשלו</string>
     <string name="sync_foreign_files_forgotten_ticker">חלק מהקבצים המקומיים נשכחו</string>
-    <string name="sync_foreign_files_forgotten_content">קבצים %1$d מחוץ לתיקיית %2$s לא ניתן להעתיק אל</string>
     <string name="pass_code_configure_your_pass_code">יש להכניס את הקוד שלך</string>
     <string name="pass_code_configure_your_pass_code_explanation">בכל פעם שיישום זה נפתח יהיה צורך להכניס את הקוד</string>
     <string name="pass_code_reenter_your_pass_code">יש להכניס את הקוד שנית</string>

+ 0 - 1
src/main/res/values-hu-rHU/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Ütközések vannak</string>
     <string name="sync_fail_in_favourites_ticker">A szinkronizálandó fájlokat nem sikerült szinkronizálni</string>
     <string name="sync_foreign_files_forgotten_ticker">Néhány helyi fájlt figyelmen kívül hagytunk</string>
-    <string name="sync_foreign_files_forgotten_content">%2$s mappából %1$d fájlt nem lehetett másolni</string>
     <string name="sync_foreign_files_forgotten_explanation">A 1.3.16 verziótól kezdve, az erről az eszközről feltöltött fájlok ebbe a mappába kerülnek: %1$s az adatvesztés elkerülésére arra az esetre ha egy fájl szinkronizálása több fiókkal is kezelt.\n\nEmiatt a változás miatt, minden a korábbi verzió által feltöltött verziók ebbe a mappába kerültek: %2$s. Ugyanakkor ezen folyamat során hiba lépett fel. Vagy hagyhatod így ahogy van és törölheted a linket: %3$s, vagy átmozgathatod a fájl(oka)t  ebbe a mappába:%1$s és meghagyhatod a linket itt: %4$s.\n\nLent láthatod a helyi fájlok és mappák listáját ebben: %5$s ahova linkelve voltak.</string>
     <string name="sync_current_folder_was_removed">A(z) %1$s mappa már nem létezik</string>
     <string name="foreign_files_move">Mind mozgatása</string>

+ 0 - 1
src/main/res/values-id/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflik ditemukan</string>
     <string name="sync_fail_in_favourites_ticker">Berkas kept-in-sync gagal</string>
     <string name="sync_foreign_files_forgotten_ticker">Beberapa berkas lokal terlupakan</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d berkas diluar folder %2$s tidak dapat disalin kedalamnya</string>
     <string name="sync_current_folder_was_removed">Folder %1$s sudah tidak ada lagi</string>
     <string name="upload_query_move_foreign_files">Ruang tidak cukup untuk menyalin berkas terpilih ke folder %1$s. Apakah Anda ingin memindahkannya?</string>
     <string name="pass_code_enter_pass_code">Masukkan kode kunci Anda</string>

+ 0 - 1
src/main/res/values-is/strings.xml

@@ -179,7 +179,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="sync_conflicts_in_favourites_ticker">Árekstrar fundust</string>
     <string name="sync_fail_in_favourites_ticker">Skrár merktar fyrir samstillingu mistókust</string>
     <string name="sync_foreign_files_forgotten_ticker">Sumar staðværar skrár gleymdust</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d skrár úr %2$s möppunni var ekki hægt að afrita í</string>
     <string name="sync_current_folder_was_removed">Mappan %1$ser ekki lengur til</string>
     <string name="upload_query_move_foreign_files">Ónógt pláss hamlar því að hægt sé að afrita valdar skrár í %1$s möppuna. Viltu færa þær þangað í staðinn?</string>
     <string name="pass_code_enter_pass_code">Settu inn lykilkóðann þinn</string>

+ 0 - 1
src/main/res/values-it/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Conflitti rilevati</string>
     <string name="sync_fail_in_favourites_ticker">Sincronizzazione dei file non riuscita</string>
     <string name="sync_foreign_files_forgotten_ticker">Alcuni file locali sono stati trascurati</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d file della cartella %2$s non possono essere copiati</string>
     <string name="sync_foreign_files_forgotten_explanation">Dalla versone 1.3.16, i file caricati da questo dispositivo sono copiati nella cartella locale %1$s per evitare perdite di dati quando un singolo file è sincronizzato con più account.\n\nA causa di questa modifica, tutti i file caricati con versioni precedenti di questa applicazione sono stati copiati nella cartella %2$s. Tuttavia, un errore ha impedito il completamento di questa operazione durante la sincronizzazione dell\'account. Puoi sia lasciare i file come sono ed eliminare il collegamento a %3$s, o spostare i file nella cartella %1$s e mantenere il collegamento a %4$s.\n\nSotto sono elencati i file locali e i file remoti in %5$sai quali erano collegati.</string>
     <string name="sync_current_folder_was_removed">La cartella %1$s non esiste più</string>
     <string name="foreign_files_move">Sposta tutto</string>

+ 0 - 1
src/main/res/values-ja-rJP/strings.xml

@@ -172,7 +172,6 @@
     <string name="sync_conflicts_in_favourites_ticker">競合が見つかりました</string>
     <string name="sync_fail_in_favourites_ticker">ファイルの同期に失敗しました</string>
     <string name="sync_foreign_files_forgotten_ticker">一部のローカルファイルが忘れられています</string>
-    <string name="sync_foreign_files_forgotten_content"> %2$s フォルダー内の %1$d ファイルはコピーできませんでした。</string>
     <string name="sync_current_folder_was_removed">フォルダー%1$sはもう存在しません</string>
     <string name="pass_code_enter_pass_code">パスコードを入力してください</string>
     

+ 0 - 1
src/main/res/values-ko/strings.xml

@@ -168,7 +168,6 @@
     <string name="sync_conflicts_in_favourites_ticker">충돌하는 항목 발견됨</string>
     <string name="sync_fail_in_favourites_ticker">파일을 동기화할 수 없었습니다</string>
     <string name="sync_foreign_files_forgotten_ticker">일부 로컬 파일이 사라졌습니다.</string>
-    <string name="sync_foreign_files_forgotten_content">폴더 %2$s의 파일 중 %1$d개를 복사할 수 없습니다</string>
     <string name="sync_current_folder_was_removed">%1$s 폴더는 더 이상 존재하지 않습니다</string>
     <string name="pass_code_enter_pass_code">암호코드를 입력하십시오</string>
     

+ 0 - 1
src/main/res/values-lv/strings.xml

@@ -127,7 +127,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Ir atrasti konflikti</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync datnes cieta neveiksmi</string>
     <string name="sync_foreign_files_forgotten_ticker">Dažas lokālās datnes tika aizmirstas</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d datnes ārpus %2$s mapes nevar kopēt uz</string>
     <string name="pass_code_enter_pass_code">Lūdzu, ievadiet piekļuves kodu</string>
     
     <string name="pass_code_configure_your_pass_code">Ievadiet piekļuves kodu</string>

+ 0 - 1
src/main/res/values-nb-rNO/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflikter funnet</string>
     <string name="sync_fail_in_favourites_ticker">Holdt-i-synk -filer mislyktes</string>
     <string name="sync_foreign_files_forgotten_ticker">Noen lokale filer ble glemt</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d filer fra %2$s mappen kunne ikke kopieres til</string>
     <string name="sync_current_folder_was_removed">Mappen %1$s finnes ikke lengre</string>
     <string name="foreign_files_move">Flytt alle</string>
     <string name="foreign_files_success">Alle filene ble flyttet</string>

+ 0 - 1
src/main/res/values-pl/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Znaleziono konflikty</string>
     <string name="sync_fail_in_favourites_ticker">Synchronizacja plików nie powiodła się</string>
     <string name="sync_foreign_files_forgotten_ticker">Niektóre lokalne pliki zostały zgubione.</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d plików z folderu %2$s nie udało się się przekopiować</string>
     <string name="sync_foreign_files_forgotten_explanation">Od wersji 1.3.16, pliki wysyłane z tego urządzenia są kopiowane do lokalnego folderu %1$s aby zapobiec utracie danych gdy pojedynczy plik jest synchronizowany z wieloma kontami.\n\nZ powodu tej zmiany, wszystkie pliki wysłane za pomocą poprzedniej wersji tej aplikacji były kopiowane do folderu %2$s. Jednakże błąd uniemożliwiał dokończenie tej operacji podczas synchronizacji konta. Możesz albo pozostawić plik(i) tak jak jest i usunąć link do %3$s lub przenieść plik(i) do folderu %1$s i pozostawić link do %4$s.\n\nPoniżej plik(i) lokalny i plik(i) zdalny w %5$s, do którego zostały zlinkowane.</string>
     <string name="sync_current_folder_was_removed">Folder %1$s nie istnieje</string>
     <string name="foreign_files_move">Przenieś wszystko</string>

+ 0 - 1
src/main/res/values-pt-rBR/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
     <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
     <string name="sync_foreign_files_forgotten_ticker">Alguns arquivos locais foram esquecidos</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d arquivos de %2$s não puderam ser copiados para a pasta</string>
     <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas.\n\nDevido à esta alteração, todos os arquivos enviados com versões anteriores deste aplicativo foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão desta operação durante a sincronização da conta. Você pode ou deixar o(s) arquivo(s) assim mesmo e excluir o link para %3$s ou mover o(s) arquivo(s) para a pasta %1$s e manter o link para %4$s.\n\nAbaixo estão listados os arquivos locais e o(s) arquivo(s) remoto(s) em %5$s para onde eles estão linkados.</string>
     <string name="sync_current_folder_was_removed">A pasta %1$s não existe mais</string>
     <string name="foreign_files_move">Mover tudo</string>

+ 0 - 1
src/main/res/values-ro/strings.xml

@@ -125,7 +125,6 @@
     <string name="sync_conflicts_in_favourites_ticker">S-au gasit conflicte</string>
     <string name="sync_fail_in_favourites_ticker">Pastrarea fisierelor in sync nu a reușit</string>
     <string name="sync_foreign_files_forgotten_ticker">Unele fisiere locale au fost uitate</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d fisiere din  dosarul  %2$s nu a putut fi copiat in</string>
     <string name="pass_code_enter_pass_code">Vă rugăm introduceți parola</string>
     
     <string name="pass_code_configure_your_pass_code">Introdu parola</string>

+ 0 - 1
src/main/res/values-ru/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Обнаружены конфликты</string>
     <string name="sync_fail_in_favourites_ticker">Не удалось синхронизировать файлы</string>
     <string name="sync_foreign_files_forgotten_ticker">Некоторые загруженные файлы не были перенесены в локальную папку </string>
-    <string name="sync_foreign_files_forgotten_content">Не удалось скопировать %1$d файлов из каталога %2$s в</string>
     <string name="sync_current_folder_was_removed">Каталог %1$s больше не существует</string>
     <string name="upload_query_move_foreign_files">Недостаточно места для копирования выбранных файлов в папку %1$s. Вы хотите их переместить?</string>
     <string name="pass_code_enter_pass_code">Введите ваш код</string>

+ 0 - 1
src/main/res/values-sk-rSK/strings.xml

@@ -151,7 +151,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Objavené konflikty</string>
     <string name="sync_fail_in_favourites_ticker">Automatická synchronizácia súborov zlyhala</string>
     <string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d súborov z %2$s priečinkov sa nepodarilo skopírovať do</string>
     <string name="pass_code_enter_pass_code">Vložte prosím svoje heslo</string>
     
     <string name="pass_code_configure_your_pass_code">Vložte svoje heslo</string>

+ 0 - 1
src/main/res/values-sl/strings.xml

@@ -177,7 +177,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Zaznani spori</string>
     <string name="sync_fail_in_favourites_ticker">Posodobitev stalno usklajenih datotek je spodletelo</string>
     <string name="sync_foreign_files_forgotten_ticker">Nekatere krajevne datoteke so spregledane</string>
-    <string name="sync_foreign_files_forgotten_content">Skupno %1$d datotek iz mape %2$s ni mogoče kopirati v</string>
     <string name="sync_current_folder_was_removed">Mapa %1$s ne obstaja več</string>
     <string name="upload_query_move_foreign_files">Ni dovolj prostora za kopiranje izbranih datotek v mapo %1$s. Ali želiš datoteke premakniti na novo mesto?</string>
     <string name="pass_code_enter_pass_code">Vnesite kodo PIN</string>

+ 0 - 1
src/main/res/values-sq/strings.xml

@@ -185,7 +185,6 @@
     <string name="sync_conflicts_in_favourites_ticker">U hasën përplasje</string>
     <string name="sync_fail_in_favourites_ticker">Mbajtja-në-sinkron e skedarëve dështoj </string>
     <string name="sync_foreign_files_forgotten_ticker">Disa kartela vendore u harruan</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d skedarë nga dosja %2$s nuk u kopjuan dot</string>
     <string name="sync_current_folder_was_removed">Dosja %1$s s’ekziston më</string>
     <string name="foreign_files_move">Zhvendosi të gjitha</string>
     <string name="foreign_files_success">U zhvendosën të gjithë skedarët</string>

+ 0 - 1
src/main/res/values-sr/strings.xml

@@ -187,7 +187,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Пронађени конфликти</string>
     <string name="sync_fail_in_favourites_ticker">Синхронизација није успела</string>
     <string name="sync_foreign_files_forgotten_ticker">Неки локални фајлови су заборављени</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d фајлова из %2$sфасцикле се није могло копирати</string>
     <string name="sync_foreign_files_forgotten_explanation">Од верзије 1.3.16, фајлови отпремљени са овог уређаја се копираки у локалну фасциклу %1$s да би се спречио губитак података када се исти фајл синхронизује са више налога.\n\nЗбог ове измене, сви фајлови који су отпремљени са старијим верзијама ове апликације су копирани у фасциклу %2$s. Ипак, грешка је онемогућила завршетак ове операције док се радила синхронизација налога. Можете или оставити фајл(ове) ту где јесу и избрисати везу ка %3$s, или померити фајл(ове) у %1$s и задржати везу ка %4$s.\n\nИспод су излистани локални фајл(ови), и удаљени фајл(ови) у %5$s на које су везани.</string>
     <string name="sync_current_folder_was_removed">Фасцикла %1$s више не постоји</string>
     <string name="foreign_files_move">Премести све</string>

+ 0 - 1
src/main/res/values-sv/strings.xml

@@ -178,7 +178,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Konflikter uppstod</string>
     <string name="sync_fail_in_favourites_ticker">Filer flaggade som Håll-filen-uppdaterad misslyckades</string>
     <string name="sync_foreign_files_forgotten_ticker">Vissa lokala filer glömdes</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d filer från %2$s mappar kunde inte kopieras till</string>
     <string name="sync_current_folder_was_removed">Mappen %1$s finns inte längre</string>
     <string name="upload_query_move_foreign_files">Otillräckligt utrymme förhindrar kopiering av de valda filerna till %1$s -mappen. Vill du flytta dem dit i stället?</string>
     <string name="pass_code_enter_pass_code">Var god ange ditt lösenord</string>

+ 0 - 1
src/main/res/values-tr/strings.xml

@@ -188,7 +188,6 @@
     <string name="sync_conflicts_in_favourites_ticker">Çakışmalar bulundu</string>
     <string name="sync_fail_in_favourites_ticker">Dosyaları eşit tutma işlemi tamamlanamadı</string>
     <string name="sync_foreign_files_forgotten_ticker">Bazı yerel dosyalar unutulmuş</string>
-    <string name="sync_foreign_files_forgotten_content">%2$s klasöründeki %1$d dosya şuraya kopyalanamadı</string>
     <string name="sync_foreign_files_forgotten_explanation">1.3.16 sürümünden sonra, veri kaybının önlenebilmesi için bu aygıttan yüklenen dosyalar, bir dosya birden fazla hesapla eşitlendiğinde %1$s yerel klasörüne kopyalanır.\n\nBu değişiklikten dolayı, bu uygulamanın yüklenmiş tüm önceki sürümündeki dosyalar %2$s klasörüne kopyalandı. Ancak hesap eşitlemesi sırasında bu işlemin tamamlanmasını engelleyen bir sorun çıktı. Dosyaları olduğu gibi bırakabilir ve %3$s bağlantısını kaldırabilir ya da dosyaları %1$s klasörüne taşıyıp %4$s bağlantısını koruyabilirsiniz.\n\nYerel dosyaları ve bağlı oldukları %5$s içindeki uzak dosyaların listesini aşağıda görebilirsiniz.</string>
     <string name="sync_current_folder_was_removed">%1$s klasörü artık yok</string>
     <string name="foreign_files_move">Tümünü taşı</string>

+ 0 - 1
src/main/res/values-zh-rCN/strings.xml

@@ -182,7 +182,6 @@
     <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
     <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
     <string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
-    <string name="sync_foreign_files_forgotten_content">%2$s 文件夹中的 %1$d 个文件不能被复制到</string>
     <string name="sync_current_folder_was_removed">文件夹%1$s不再存在</string>
     <string name="foreign_files_move">移动全部</string>
     <string name="upload_query_move_foreign_files">空间不足将阻止将所选文件复制到%1$s文件夹中。 你想把它们移到那里吗?</string>

+ 0 - 1
src/main/res/values-zh-rTW/strings.xml

@@ -169,7 +169,6 @@
     <string name="sync_conflicts_in_favourites_ticker">出現衝突</string>
     <string name="sync_fail_in_favourites_ticker">同步檔案失敗</string>
     <string name="sync_foreign_files_forgotten_ticker">有些本地端的檔案已遺失</string>
-    <string name="sync_foreign_files_forgotten_content">%2$s 資料夾中的 %1$d 個檔案無法被複製進去</string>
     <string name="sync_current_folder_was_removed">資料夾%1$s已不存在</string>
     <string name="upload_query_move_foreign_files">空間不足以將選擇檔案複製到%1$s資料夾,是否要改用移動檔案?</string>
     <string name="pass_code_enter_pass_code">請輸入通行碼</string>

+ 4 - 1
src/main/res/values/strings.xml

@@ -192,7 +192,10 @@
         <item quantity="other">Contents of %1$d files could not be sync\'ed (conflicts: %2$d)</item>
     </plurals>
     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s folder could not be copied into</string>
+    <plurals name="sync_foreign_files_forgotten_content">
+        <item quantity="one">%1$d file out of the %2$s folder could not be copied into</item>
+        <item quantity="other">%1$d files out of the %2$s folder could not be copied into</item>
+    </plurals>
     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded with earlier versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and delete the link to %3$s, or move the file(s) into the %1$s folder and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.</string>
     <string name="sync_current_folder_was_removed">The folder %1$s does not exist anymore</string>
     <string name="foreign_files_move">Move all</string>