Merge remote-tracking branch 'origin/master' into dev

app/src/main/res/values-ar/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">محلياً فقط</string>
     <string name="conflict_dialog_error">تعذّر إنشاء نافذة حوار حل التعارضات</string>
     <string name="conflict_file_headline">ملف متضارب %1$s </string>
+    <string name="conflict_folder_headline">تعارض مجلد</string>
     <string name="conflict_local_file">ملف محلي</string>
     <string name="conflict_message_description">إذا قمت باختيار كلا الاصدارين, الملف المحلي سيحتوي على رقم ملحق باسم الملف.</string>
+    <string name="conflict_message_description_for_folder">إذا اخترت الاحتفاظ بكلتا النسختين، سيتم إلحاق أرقام تسلسلية في نهاية اسم المجلد المحلي.</string>
     <string name="conflict_server_file">ملف على الخادم</string>
     <string name="contact_backup_title">نسخ احتياطي لجهات الاتصال</string>
     <string name="contact_no_permission">إذن الاتصال بالجهة لازم.</string>
@@ -577,6 +579,8 @@
     <string name="note_could_not_sent">لا يمكن إرسال الملاحظة</string>
     <string name="note_icon_hint">أيقونة الملاحظة</string>
     <string name="notification_action_failed">فشل في تنفيذ الإجراء.</string>
+    <string name="notification_channel_background_operations_description">إظهار الإشعارات للتفاعل مع نتائج العمليات في الخلفية</string>
+    <string name="notification_channel_background_operations_name">العمليات في الخلفية</string>
     <string name="notification_channel_download_description">يظهر تقدم التنزيل</string>
     <string name="notification_channel_download_name_short">التنزيلات</string>
     <string name="notification_channel_file_sync_description">يعرض تقدم مزامنة الملف والنتائج</string>
@@ -592,7 +596,13 @@
     <string name="notification_icon">أيقونة الإشعار</string>
     <string name="notifications_no_results_headline">لا توجد هناك إخطارات</string>
     <string name="notifications_no_results_message">يرجى التحقق مرة أخرى في وقت لاحق.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">عملية مُعلَّقة</string>
     <string name="offline_mode">ليس هناك اتصال بالأنترنت</string>
+    <string name="offline_operations_worker_notification_conflict_text">مجلد متعارض: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">حذف مجلد غير متصل</string>
+    <string name="offline_operations_worker_notification_error_text">لا يمكن إكمال العملية دون اتصال. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">عمليات دون اتصال بالإنترنت</string>
+    <string name="offline_operations_worker_notification_start_text">البدء في العمليات دون اتصال بالإنترنت</string>
     <string name="oneHour">ساعة واحدة</string>
     <string name="online">متصل</string>
     <string name="online_status">حالات الاتصال</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Local only</string>
     <string name="conflict_dialog_error">Conflict resolver dialog cannot be created</string>
     <string name="conflict_file_headline">Conflicting file %1$s</string>
+    <string name="conflict_folder_headline">Folder Conflict</string>
     <string name="conflict_local_file">Local file</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
+    <string name="conflict_message_description_for_folder">If you select both versions, the local folder will have a number appended to its name.</string>
     <string name="conflict_server_file">Server file</string>
     <string name="contact_backup_title">Contacts backup</string>
     <string name="contact_no_permission">Contact permission is required.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Could not send note</string>
     <string name="note_icon_hint">Note icon</string>
     <string name="notification_action_failed">Failed to execute action.</string>
+    <string name="notification_channel_background_operations_description">Show notifications to interact result of background operations</string>
+    <string name="notification_channel_background_operations_name">Background Operations</string>
     <string name="notification_channel_download_description">Shows download progress</string>
     <string name="notification_channel_download_name_short">Downloads</string>
     <string name="notification_channel_file_sync_description">Shows file sync progress and results</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Notification icon</string>
     <string name="notifications_no_results_headline">No notifications</string>
     <string name="notifications_no_results_message">Please check back later.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Pending Operation</string>
     <string name="offline_mode">No internet connection</string>
+    <string name="offline_operations_worker_notification_conflict_text">Conflicted Folder: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Delete Offline Folder</string>
+    <string name="offline_operations_worker_notification_error_text">The offline operation cannot be completed. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Offline Operations</string>
+    <string name="offline_operations_worker_notification_start_text">Starting Offline Operations</string>
     <string name="oneHour">1 hour</string>
     <string name="online">Online</string>
     <string name="online_status">Online status</string>

app/src/main/res/values-de/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Nur lokal</string>
     <string name="conflict_dialog_error">Konfliktlösungsdialog konnte nicht erstellt werden</string>
     <string name="conflict_file_headline">Konflikt-Datei %1$s</string>
+    <string name="conflict_folder_headline">Ordnerkonfilikt</string>
     <string name="conflict_local_file">Lokale Datei</string>
     <string name="conflict_message_description">Falls beide Versionen gewählt werden, wird bei der lokalen Datei eine Zahl am Ende des Dateinamens hinzugefügt.</string>
+    <string name="conflict_message_description_for_folder">Falls beide Versionen gewählt werden, wird beim lokalen Ordner eine Zahl am Ende des Dateinamens hinzugefügt.</string>
     <string name="conflict_server_file">Server-Datei</string>
     <string name="contact_backup_title">Kontakte-Backup</string>
     <string name="contact_no_permission">Eine Kontakterlaubnis ist erforderlich.</string>
@@ -488,7 +490,7 @@
     <string name="instant_upload_on_charging">Nur während des Ladens der Batterie hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>
     <string name="internal_two_way_sync">Interne 2-Wege-Synchronisierung</string>
-    <string name="internal_two_way_sync_not_yet">Bislang nicht, aber in Kürze synchronisiert</string>
+    <string name="internal_two_way_sync_not_yet">Bislang nicht, wird demnächst synchronisiert</string>
     <string name="invalid_url">Ungültige URL</string>
     <string name="invisible">Unsichtbar</string>
     <string name="label_empty">Bezeichnung darf nicht leer sein</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Notiz konnte nicht versandt werden</string>
     <string name="note_icon_hint">Notiz-Symbol</string>
     <string name="notification_action_failed">Ausführen der Aktion fehlgeschlagen.</string>
+    <string name="notification_channel_background_operations_description">Benachrichtigungen anzeigen, um auf die Ergebnisse von Hintergrundoperationen zu reagieren</string>
+    <string name="notification_channel_background_operations_name">Hintergrundoperationen</string>
     <string name="notification_channel_download_description">Zeigt den Herunterlade-Fortschritt an</string>
     <string name="notification_channel_download_name_short">Downloads</string>
     <string name="notification_channel_file_sync_description">Zeigt den Fortschritt der Dateisynchronisierung und die Ergebnisse an</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Benachrichtigungssymbol</string>
     <string name="notifications_no_results_headline">Keine Benachrichtigungen</string>
     <string name="notifications_no_results_message">Bitte später noch einmal nachsehen.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Ausstehende Operationen</string>
     <string name="offline_mode">Keine Internetverbindung</string>
+    <string name="offline_operations_worker_notification_conflict_text">Konfliktordner: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Offlineordner löschen</string>
+    <string name="offline_operations_worker_notification_error_text">Der Offlinevorgang kann nicht abgeschlossen werden. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Offline-Operationen</string>
+    <string name="offline_operations_worker_notification_start_text">Offline-Operationen werden gestartet</string>
     <string name="oneHour">1 Stunde</string>
     <string name="online">Online</string>
     <string name="online_status">Online-Status</string>

app/src/main/res/values-fr/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Local seulement</string>
     <string name="conflict_dialog_error">Erreur lors de la création de la boîte de dialogue de conflit !</string>
     <string name="conflict_file_headline">Fichier %1$s en conflit</string>
+    <string name="conflict_folder_headline">Conflit de dossiers</string>
     <string name="conflict_local_file">fichier local</string>
     <string name="conflict_message_description">Si vous sélectionnez les deux versions, le fichier local aura un numéro ajouté à son nom.</string>
+    <string name="conflict_message_description_for_folder">Si vous sélectionnez les deux versions, le dossier local portera un numéro ajouté à son nom.</string>
     <string name="conflict_server_file">Fichier serveur</string>
     <string name="contact_backup_title">Sauvegarde des contacts</string>
     <string name="contact_no_permission">La permission d\'accès à vos contacts est requise</string>
@@ -570,6 +572,8 @@
     <string name="note_could_not_sent">Impossible d\'envoyer la note</string>
     <string name="note_icon_hint">Icône de note</string>
     <string name="notification_action_failed">Échec lors de l\'exécution de l\'action.</string>
+    <string name="notification_channel_background_operations_description">Afficher des notifications pour interagir avec le résultat des opérations en arrière-plan</string>
+    <string name="notification_channel_background_operations_name">Opérations en arrière-plan</string>
     <string name="notification_channel_download_description">Afficher la progression de téléchargement</string>
     <string name="notification_channel_download_name_short">Téléchargements</string>
     <string name="notification_channel_file_sync_description">Afficher les résultats et la progression de synchronisation du fichier</string>
@@ -585,7 +589,13 @@
     <string name="notification_icon">Icône de notification</string>
     <string name="notifications_no_results_headline">Aucune notification</string>
     <string name="notifications_no_results_message">Veuillez revenir plus tard.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Opération en attente</string>
     <string name="offline_mode">Aucune connexion Internet</string>
+    <string name="offline_operations_worker_notification_conflict_text">Dossier en conflit : %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Supprimer le dossier hors ligne</string>
+    <string name="offline_operations_worker_notification_error_text">L\'opération hors ligne ne peut être achevée. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Opérations hors ligne</string>
+    <string name="offline_operations_worker_notification_start_text">Démarrage des opérations hors ligne</string>
     <string name="oneHour">1 heure</string>
     <string name="online">En ligne</string>
     <string name="online_status">Statut en ligne</string>

app/src/main/res/values-ga/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Áitiúil amháin</string>
     <string name="conflict_dialog_error">Ní féidir dialóg réititheora coinbhleachta a chruthú</string>
     <string name="conflict_file_headline">Comhad contrártha %1$s</string>
+    <string name="conflict_folder_headline">Coimhlint Fillteán</string>
     <string name="conflict_local_file">Comhad áitiúil</string>
     <string name="conflict_message_description">Má roghnaíonn tú an dá leagan, beidh uimhir ag gabháil leis an gcomhad áitiúil lena ainm.</string>
+    <string name="conflict_message_description_for_folder">Má roghnaíonn tú an dá leagan, beidh uimhir ag gabháil leis an bhfillteán áitiúil lena ainm.</string>
     <string name="conflict_server_file">Comhad freastalaí</string>
     <string name="contact_backup_title">Cúltaca teagmhálacha</string>
     <string name="contact_no_permission">Teastaíonn cead teagmhála.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Níorbh fhéidir nóta a sheoladh</string>
     <string name="note_icon_hint">Deilbhín nóta</string>
     <string name="notification_action_failed">Theip ar an ngníomh a chur i gcrích.</string>
+    <string name="notification_channel_background_operations_description">Taispeáin fógraí chun idirghníomhú a dhéanamh ar thoradh oibríochtaí cúlra</string>
+    <string name="notification_channel_background_operations_name">Oibríochtaí Cúlra</string>
     <string name="notification_channel_download_description">Léiríonn dul chun cinn íoslódáil</string>
     <string name="notification_channel_download_name_short">Íoslódálacha</string>
     <string name="notification_channel_file_sync_description">Taispeánann sé dul chun cinn agus torthaí sioncronaithe comhad</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Deilbhín fógra</string>
     <string name="notifications_no_results_headline">Gan fógraí</string>
     <string name="notifications_no_results_message">Seiceáil ar ais ar ball le do thoil.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Oibríocht ar Feitheamh</string>
     <string name="offline_mode">Gan nasc idirlín</string>
+    <string name="offline_operations_worker_notification_conflict_text">Fillteán Coimhlinte: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Scrios Fillteán As Líne</string>
+    <string name="offline_operations_worker_notification_error_text">Ní féidir an oibríocht as líne a chríochnú. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Oibríochtaí As Líne</string>
+    <string name="offline_operations_worker_notification_start_text">Oibríochtaí As Líne a Thosú</string>
     <string name="oneHour">1 uair</string>
     <string name="online">Ar líne</string>
     <string name="online_status">Stádas ar líne</string>

app/src/main/res/values-gl/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Só local</string>
     <string name="conflict_dialog_error">Non é posíbel crear o diálogo de resolución de conflitos</string>
     <string name="conflict_file_headline">Ficheiro en conflito %1$s</string>
+    <string name="conflict_folder_headline">Conflito de cartafol</string>
     <string name="conflict_local_file">Ficheiro local</string>
     <string name="conflict_message_description">Se selecciona ambas versións, o ficheiro local terá un número engadido ao nome.</string>
+    <string name="conflict_message_description_for_folder">Se selecciona ambas versións, o cartafol local terá un número engadido ao nome.</string>
     <string name="conflict_server_file">Ficheiro do servidor</string>
     <string name="contact_backup_title">Copia de seguranza dos contactos</string>
     <string name="contact_no_permission">Precisase de permiso de contacto.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Non foi posíbel enviar a nota</string>
     <string name="note_icon_hint">Icona de nota</string>
     <string name="notification_action_failed">Produciuse un fallo ao executar a acción.</string>
+    <string name="notification_channel_background_operations_description">Amosar notificacións para interactuar co resultado das operacións en segundo plano</string>
+    <string name="notification_channel_background_operations_name">Operacións en segundo plano</string>
     <string name="notification_channel_download_description">Amosa o progreso da descarga</string>
     <string name="notification_channel_download_name_short">Descargas</string>
     <string name="notification_channel_file_sync_description">Amosa o progreso e os resultados da sincronización de ficheiros</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Icona de notificación</string>
     <string name="notifications_no_results_headline">Non hai notificacións</string>
     <string name="notifications_no_results_message">Compróbeo máis adiante.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Operación pendente</string>
     <string name="offline_mode">Sen conexión coa Internet</string>
+    <string name="offline_operations_worker_notification_conflict_text">Cartafol en conflito: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Eliminar o cartafol sen conexión</string>
+    <string name="offline_operations_worker_notification_error_text">Non é posíbel completar a operación sen conexión. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Operacións sen conexión</string>
+    <string name="offline_operations_worker_notification_start_text">Iniciando operacións sen conexión</string>
     <string name="oneHour">1 hora</string>
     <string name="online">En liña</string>
     <string name="online_status">Estado en liña</string>

app/src/main/res/values-sv/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Endast lokalt</string>
     <string name="conflict_dialog_error">Dialogrutan för konfliktlösning kan inte skapas</string>
     <string name="conflict_file_headline">Konfliktande fil %1$s</string>
+    <string name="conflict_folder_headline">Mappkonflikt</string>
     <string name="conflict_local_file">Lokal fil</string>
     <string name="conflict_message_description">Om du väljer båda versionerna kommer den lokala filen få ett nummer tillagt i filnamnet.</string>
+    <string name="conflict_message_description_for_folder">Om du väljer båda versionerna kommer den lokala mappen få ett nummer tillagt i namnet.</string>
     <string name="conflict_server_file">Serverfil</string>
     <string name="contact_backup_title">Backup av kontakter</string>
     <string name="contact_no_permission">Rättighet till kontakt krävs.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Kunde inte skicka meddelande</string>
     <string name="note_icon_hint">Antecknings ikon</string>
     <string name="notification_action_failed">Misslyckades utföra åtgärd.</string>
+    <string name="notification_channel_background_operations_description">Visa aviseringar för att interagera resultatet av bakgrundsoperationer</string>
+    <string name="notification_channel_background_operations_name">Bakgrundsoperationer</string>
     <string name="notification_channel_download_description">Visar hämtningsförloppet</string>
     <string name="notification_channel_download_name_short">Nerladdningar</string>
     <string name="notification_channel_file_sync_description">Visar filsynkroniserings förlopp och resultat</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Meddelandeikon</string>
     <string name="notifications_no_results_headline">Inga aviseringar</string>
     <string name="notifications_no_results_message">Vänligen kontrollera igen senare.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Väntande operation</string>
     <string name="offline_mode">Ingen internetanslutning</string>
+    <string name="offline_operations_worker_notification_conflict_text">Mapp i konflikt: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Radera offlinemapp</string>
+    <string name="offline_operations_worker_notification_error_text">Offlineåtgärden kan inte slutföras. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Offline-operationer</string>
+    <string name="offline_operations_worker_notification_start_text">Starta offline-operationer</string>
     <string name="oneHour">1 timme</string>
     <string name="online">Online</string>
     <string name="online_status">Online-status</string>
@@ -909,6 +919,7 @@
     <string name="trashbin_file_remove">Ta bort permanent</string>
     <string name="trashbin_loading_failed">Laddning av papperskorg misslyckades!</string>
     <string name="trashbin_not_emptied">Filer kunde inte tas bort permanent!</string>
+    <string name="unexpected_error_occurred">Ett oväntat fel inträffade</string>
     <string name="unified_search_fragment_calendar_event_not_found">Händelsen hittades inte, du kan alltid synkronisera för att uppdatera. Omdirigerar till webben...</string>
     <string name="unified_search_fragment_contact_not_found">Kontakten hittades inte, du kan alltid synkronisera för att uppdatera. Omdirigerar till webben...</string>
     <string name="unified_search_fragment_permission_needed">Behörigheter krävs för att öppna sökresultatet, annars omdirigeras det till webben...</string>

app/src/main/res/values-tr/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Yalnızca yerel</string>
     <string name="conflict_dialog_error">Çakışma çözümleme penceresi oluşturulamadı</string>
     <string name="conflict_file_headline">%1$s dosyası çakışıyor</string>
+    <string name="conflict_folder_headline">Klasör çakışması</string>
     <string name="conflict_local_file">Yerel dosya</string>
     <string name="conflict_message_description">İki sürümü de saklamayı seçerseniz, yerel dosyanın adına bir numara eklenecek.</string>
+    <string name="conflict_message_description_for_folder">İki sürümü de saklamayı seçerseniz, yerel klasörün adına bir numara eklenecek.</string>
     <string name="conflict_server_file">Sunucu dosyası</string>
     <string name="contact_backup_title">Kişiler yedeği</string>
     <string name="contact_no_permission">Kişi izinleri gerekli.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Not gönderilemedi</string>
     <string name="note_icon_hint">Not simgesi</string>
     <string name="notification_action_failed">İşlem yapılamadı.</string>
+    <string name="notification_channel_background_operations_description">Arka plan işlemlerinin sonucuyla etkileşim kurmak için bildirimleri görüntüle</string>
+    <string name="notification_channel_background_operations_name">Arka plan işlemleri</string>
     <string name="notification_channel_download_description">İndirme ilerlemesini görüntüler</string>
     <string name="notification_channel_download_name_short">İndirmeler</string>
     <string name="notification_channel_file_sync_description">Dosya eşitleme ilerlemesi ve sonuçlarını görüntüler</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Bildirim simgesi</string>
     <string name="notifications_no_results_headline">Herhangi bir bildirim yok</string>
     <string name="notifications_no_results_message">Lütfen bir süre sonra yeniden bakın.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">İşlenmeyi bekliyor</string>
     <string name="offline_mode">İnternet bağlantısı yok</string>
+    <string name="offline_operations_worker_notification_conflict_text">Çakışan klasör: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Çevrim dışı klasörü sil</string>
+    <string name="offline_operations_worker_notification_error_text">Çevrim dışı işlem tamamlanamadı. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Çevrim dışı işlemler</string>
+    <string name="offline_operations_worker_notification_start_text">Çevrim dışı işlemleri başlatılıyor</string>
     <string name="oneHour">1 saat</string>
     <string name="online">Çevrim içi</string>
     <string name="online_status">Çevrim içi durumu</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">僅本機</string>
     <string name="conflict_dialog_error">無法建立衝突解決對話方塊</string>
     <string name="conflict_file_headline">檔案 %1$s 衝突</string>
+    <string name="conflict_folder_headline">資料夾衝突</string>
     <string name="conflict_local_file">本機檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，本機的檔案會在檔名後附加編號。</string>
+    <string name="conflict_message_description_for_folder">若您同時選擇兩個版本，本機的資料夾會在檔名後附加編號。</string>
     <string name="conflict_server_file">伺服器檔案</string>
     <string name="contact_backup_title">聯絡人備份</string>
     <string name="contact_no_permission">需要聯絡人權限。</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">傳送筆記失敗</string>
     <string name="note_icon_hint">記事本圖示</string>
     <string name="notification_action_failed">執行的動作失敗</string>
+    <string name="notification_channel_background_operations_description">顯示通知以與背景操作的結果互動</string>
+    <string name="notification_channel_background_operations_name">背景操作</string>
     <string name="notification_channel_download_description">顯示下載進度</string>
     <string name="notification_channel_download_name_short">下載</string>
     <string name="notification_channel_file_sync_description">顯示檔案同步進度和結果</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">提示圖示</string>
     <string name="notifications_no_results_headline">沒有通知</string>
     <string name="notifications_no_results_message">請稍候再檢查</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">擱置中的操作</string>
     <string name="offline_mode">沒有網路連線</string>
+    <string name="offline_operations_worker_notification_conflict_text">衝突的資料夾：%s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">刪除離線資料夾</string>
+    <string name="offline_operations_worker_notification_error_text">無法完成離線操作。%s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">離線操作</string>
+    <string name="offline_operations_worker_notification_start_text">開始離線操作</string>
     <string name="oneHour">1小時</string>
     <string name="online">上線</string>
     <string name="online_status">上線狀態</string>

app/src/main/res/values/strings.xml

@@ -26,7 +26,7 @@
     <string name="oc_file_list_adapter_offline_operation_description_text">Pending Operation</string>
     <string name="ecosystem_apps_display_assistant">Assistant</string>
     <string name="unexpected_error_occurred">Unexpected error occurred</string>
-    <string name="app_config_base_url_title">Base Url</string>
+    <string name="app_config_base_url_title">Base URL</string>
     <string name="app_config_proxy_host_title">Proxy Host Name</string>
     <string name="app_config_proxy_port_title">Proxy Port</string>
     <string name="offline_operations_worker_notification_delete_offline_folder">Delete Offline Folder</string>