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

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

@@ -951,6 +951,10 @@
     <string name="trashbin_file_remove">حذف نهائي</string>
     <string name="trashbin_loading_failed">فشل تحميل سلة المحذوفات</string>
     <string name="trashbin_not_emptied">تعذر حذف الملفات نهائياً!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">التعطيل لكل المجلدات</string>
+    <string name="two_way_sync_activity_empty_list_desc">لإعداد مجلد المزامنة ثنائي الاتجاه، يرجى تمكينه في علامة التبويب \"التفاصيل\" للمجلد المعني.</string>
+    <string name="two_way_sync_activity_empty_list_title">لم يتم إعداد المزامنة ثنائية الاتجاه</string>
+    <string name="two_way_sync_activity_title">مزامنة داخلية في الاتجاهين</string>
     <string name="unexpected_error_occurred">حدث خطأ غير متوقع</string>
     <string name="unified_search_fragment_calendar_event_not_found">لم يمكن العثور على الحدث. يمكنك دائمًا المزامنة للتحديث. جارٍ إعادة التوجيه إلى الويب...</string>
     <string name="unified_search_fragment_contact_not_found">لم يمكن العثور على جهة الاتصال. يمكنك دائمًا المزامنة للتحديث. جارٍ إعادة التوجيه إلى الويب...</string>

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

@@ -925,6 +925,9 @@
     <string name="trashbin_file_remove">Delete permanently</string>
     <string name="trashbin_loading_failed">Loading trash bin failed!</string>
     <string name="trashbin_not_emptied">Files could not be deleted permanently!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Disable for all folders</string>
+    <string name="two_way_sync_activity_empty_list_desc">To set up a two way sync folder, please enable it in the details tab of the folder in question.</string>
+    <string name="two_way_sync_activity_empty_list_title">Two way sync not set up</string>
     <string name="two_way_sync_activity_title">Internal two way sync</string>
     <string name="unexpected_error_occurred">Unexpected error occurred</string>
     <string name="unified_search_fragment_calendar_event_not_found">Event not found, you can always sync to update. Redirecting to web…</string>

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

@@ -925,6 +925,9 @@
     <string name="trashbin_file_remove">Endgültig löschen</string>
     <string name="trashbin_loading_failed">Laden des Papierkorbs fehlgeschlagen!</string>
     <string name="trashbin_not_emptied">Dateien konnten nicht endgültig gelöscht werden!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Für alle Ordner deaktivieren</string>
+    <string name="two_way_sync_activity_empty_list_desc">Um einen Ordner mit bidirektionaler Synchronisierung einzurichten, aktivieren Sie dies bitte auf der Registerkarte \"Details“ des betreffenden Ordners.</string>
+    <string name="two_way_sync_activity_empty_list_title">Zwei-Wege-Synchronisierung nicht eingerichtet</string>
     <string name="two_way_sync_activity_title">Interne 2-Wege-Synchronisierung</string>
     <string name="unexpected_error_occurred">Es ist ein unerwarteter Fehler aufgetreten</string>
     <string name="unified_search_fragment_calendar_event_not_found">Termin nicht gefunden, Sie können jederzeit die Synchronisierung wiederholen. Weiterleiten zum Web…</string>

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

@@ -612,6 +612,7 @@
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="player_stop">parar</string>
     <string name="player_toggle">cambiar</string>
+    <string name="please_select_a_server">Por favor seleccione un servidor...</string>
     <string name="power_save_check_dialog_message">Desactivar la comprobación de ahorro de energía puede causar que se suban ficheros aun estando en modo de baja batería</string>
     <string name="pref_behaviour_entries_delete_file">borrado</string>
     <string name="pref_behaviour_entries_keep_file">dejado en la carpeta original</string>
@@ -921,7 +922,10 @@
     <string name="upload_cannot_create_file">No se puede crear el archivo local</string>
     <string name="upload_chooser_title">Subir desde…</string>
     <string name="upload_content_from_other_apps">Subir contenido desde otras apps</string>
+    <string name="upload_direct_camera_photo">Foto</string>
+    <string name="upload_direct_camera_promt">¿Quieres tomar una foto o un video?</string>
     <string name="upload_direct_camera_upload">Subir de la cámara</string>
+    <string name="upload_direct_camera_video">Vídeo</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Archivo de atajo a Google Maps(%s)</string>

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

@@ -925,6 +925,9 @@
     <string name="trashbin_file_remove">Supprimer définitivement</string>
     <string name="trashbin_loading_failed">Le chargement de la corbeille a échoué !</string>
     <string name="trashbin_not_emptied">Des fichiers n\'ont pas pu être supprimés de manière définitive !</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Désactiver pour tous les dossiers</string>
+    <string name="two_way_sync_activity_empty_list_desc">Pour configurer un dossier de synchronisation bidirectionnelle, veuillez l\'activer dans l\'onglet détails du dossier en question.</string>
+    <string name="two_way_sync_activity_empty_list_title">La synchronisation bidirectionnelle n\'est pas configurée</string>
     <string name="two_way_sync_activity_title">Synchronisation interne bidirectionnelle</string>
     <string name="unexpected_error_occurred">Une erreur est survenue</string>
     <string name="unified_search_fragment_calendar_event_not_found">Événement introuvable; vous pouvez toujours synchroniser pour mettre à jour. Redirection au web…</string>

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

@@ -925,6 +925,9 @@
     <string name="trashbin_file_remove">Scrios go buan</string>
     <string name="trashbin_loading_failed">Theip ar lódáil an bhosca bruscair!</string>
     <string name="trashbin_not_emptied">Níorbh fhéidir na comhaid a scriosadh go buan!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Díchumasaigh do gach fillteán</string>
+    <string name="two_way_sync_activity_empty_list_desc">Chun fillteán sioncronaithe dhá bhealach a shocrú, cumasaigh é i gcluaisín sonraí an fhillteáin atá i gceist.</string>
+    <string name="two_way_sync_activity_empty_list_title">Sioncronú dhá bhealach gan socrú</string>
     <string name="two_way_sync_activity_title">Sioncronú inmheánach dhá bhealach</string>
     <string name="unexpected_error_occurred">Tharla earráid gan choinne</string>
     <string name="unified_search_fragment_calendar_event_not_found">Níor aimsíodh an t-imeacht, is féidir leat sioncronú a dhéanamh i gcónaí chun nuashonrú a dhéanamh. Á atreorú chuig an ngréasán…</string>

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

@@ -926,6 +926,9 @@
     <string name="trashbin_file_remove">Eliminar definitivamente</string>
     <string name="trashbin_loading_failed">Produciuse un fallo ao cargar o cesto do lixo!</string>
     <string name="trashbin_not_emptied">Non foi posíbel eliminar definitivamente o ficheiro!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Desactivado para todos os cartafoles</string>
+    <string name="two_way_sync_activity_empty_list_desc">Para definir un cartafol de sincronización bidireccional, actíveo na lapela de detalles do cartafol en cuestión.</string>
+    <string name="two_way_sync_activity_empty_list_title">A sincronización bidireccional non está definida</string>
     <string name="two_way_sync_activity_title">Sincronización interna bidireccional</string>
     <string name="unexpected_error_occurred">Produciuse un erro non agardado</string>
     <string name="unified_search_fragment_calendar_event_not_found">Non se atopou o evento, sempre pode sincronizar para actualizar. Redirixindo á web…</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -101,6 +101,7 @@
     <string name="calendars">Kalendoriai</string>
     <string name="certificate_load_problem">Klaida, įkeliant liudijimą.</string>
     <string name="changelog_dev_version">Dev versijos pakeitimų žurnalas</string>
+    <string name="check_back_later_or_reload">Patikrinkite vėliau arba įkelkite iš naujo.</string>
     <string name="checkbox">Žymimasis langelis</string>
     <string name="choose_local_folder">Pasirinkite aplanką ...</string>
     <string name="choose_remote_folder">Pasirinkti nuotolinį aplanką…</string>
@@ -155,6 +156,7 @@
     <string name="community_testing_headline">Pagalba testuojant</string>
     <string name="community_testing_report_text">Pranešti apie problemą per „GitHub“</string>
     <string name="configure_new_media_folder_detection_notifications">Konfigūruoti</string>
+    <string name="confirm_removal">Šalinti vietinį šifravimą</string>
     <string name="confirmation_remove_file_alert">Ar tikrai norite ištrinti %1$s?</string>
     <string name="confirmation_remove_files_alert">Ar tikrai norite ištrinti pažymėtus elementus?</string>
     <string name="confirmation_remove_folder_alert">Ar tikrai norite ištrinti %1$s ir jo turinį?</string>
@@ -360,6 +362,7 @@
     <string name="file_migration_updating_index">Atnaujinamas indeksas…</string>
     <string name="file_migration_use_data_folder">Naudok</string>
     <string name="file_migration_waiting_for_unfinished_sync">Laukiama pilno sinchronizavimo…</string>
+    <string name="file_name_validator_error_forbidden_file_extensions">%s yra draudžiamas failo prievardis</string>
     <string name="file_name_validator_error_forbidden_space_character_extensions">Failų pavadinimų pradžioje ar pabaigoje negali būti tarpų</string>
     <string name="file_name_validator_error_invalid_character">Pavadinime yra netinkamų simbolių: %s</string>
     <string name="file_name_validator_error_reserved_names">%s yra draudžiamas pavadinimas</string>
@@ -423,6 +426,7 @@
     <string name="invalid_url">Neteisingas URL</string>
     <string name="invisible">Nematoma</string>
     <string name="label_empty">Etiketė negali būti tuščia</string>
+    <string name="last_backup">Paskutinė atsarginė kopija: %1$s</string>
     <string name="link">Nuoroda</string>
     <string name="link_name">Nuorodos pavadinimas</string>
     <string name="link_share_allow_upload_and_editing">Leisti įkelti ir redaguoti</string>
@@ -442,6 +446,7 @@
     <string name="locked_by_app">Užrakino %1$s programėlė</string>
     <string name="log_send_mail_subject">%1$s Android žurnalai</string>
     <string name="log_send_no_mail_app">Nerasta jokios programėlės, skirtos siųsti žurnalus. Įsidiekite el. pašto kliento programėlę.</string>
+    <string name="logged_in_as">Prisijungta kaip %1$s</string>
     <string name="login">Prisijungti</string>
     <string name="login_url_helper_text">Nuoroda į jūsų %1$s saityno sąsają, kuomet atveriate ją naršyklėje.</string>
     <string name="logs_menu_delete">Ištrinti žurnalus</string>
@@ -569,6 +574,7 @@
     <string name="prefs_instant_behaviour_dialogTitle">Pradinis failas bus…</string>
     <string name="prefs_instant_behaviour_title">Pradinis failas bus…</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Naudoti poaplankius</string>
+    <string name="prefs_instant_upload_subfolder_rule_title">Poaplankio parinktys</string>
     <string name="prefs_license">Licencija</string>
     <string name="prefs_lock">Programos užraktas</string>
     <string name="prefs_lock_device_credentials_enabled">Įrenginio prisijungimo duomenys įjungti</string>
@@ -650,6 +656,7 @@
     <string name="set_status">Nustatyti būseną</string>
     <string name="set_status_message">Nustatyti būsenos žinutę</string>
     <string name="share">Bendrinti</string>
+    <string name="share_copy_link">Bendrinti ir kopijuoti nuorodą</string>
     <string name="share_dialog_title">Bendrinimas</string>
     <string name="share_expiration_date_format">%1$s</string>
     <string name="share_expiration_date_label">Galioja iki %1$s</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -925,6 +925,9 @@
     <string name="trashbin_file_remove">Remover permanentemente</string>
     <string name="trashbin_loading_failed">Falha ao carregar a lixeira! </string>
     <string name="trashbin_not_emptied">Os arquivos não puderam ser excluídos permanentemente!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Desative para todas as pastas</string>
+    <string name="two_way_sync_activity_empty_list_desc">Para configurar uma pasta de sincronização de duas vias, ative-a na guia Detalhes da pasta em questão.</string>
+    <string name="two_way_sync_activity_empty_list_title">Sincroniza de duas maneiras não configuradas</string>
     <string name="two_way_sync_activity_title">Sincronização interna bidirecional</string>
     <string name="unexpected_error_occurred">Ocorreu um erro inesperado</string>
     <string name="unified_search_fragment_calendar_event_not_found">Evento não encontrado, você sempre pode sincronizar para atualizar. Redirecionando para a web…</string>
@@ -934,6 +937,7 @@
     <string name="unread_comments">Existem comentários não lidos</string>
     <string name="unset_encrypted">Definir como não criptografado</string>
     <string name="unset_favorite">Remover dos favoritos</string>
+    <string name="unset_internal_two_way_sync_description">Remova a pasta da sincronização interna de duas maneiras</string>
     <string name="unshare_link_file_error">Ocorreu um erro ao tentar descompartilhar este arquivo ou pasta.</string>
     <string name="unshare_link_file_no_exist">Não foi possível descompartilhar. Verifique se o arquivo existe.</string>
     <string name="unshare_link_forbidden_permissions">para descompartilhar este arquivo</string>

app/src/main/res/values-sr-rSP/strings.xml

@@ -10,10 +10,12 @@
     <string name="account_not_found">Nalog nije nađen!</string>
     <string name="action_edit">Izmeni</string>
     <string name="action_empty_notifications">Očisti sva obaveštenja</string>
+    <string name="action_empty_trashbin">Isprazni kantu</string>
     <string name="action_send_share">Slanje/Deljenje</string>
     <string name="action_switch_grid_view">Prikaz mreže</string>
     <string name="action_switch_list_view">Prikaz liste</string>
     <string name="actionbar_mkdir">Nova fascikla</string>
+    <string name="actionbar_move_or_copy">Premesti ili kopiraj</string>
     <string name="actionbar_open_with">Otvori pomoću</string>
     <string name="actionbar_search">Pretraga</string>
     <string name="actionbar_see_details">Detalji</string>
@@ -26,7 +28,19 @@
     <string name="activity_chooser_title">Pošalji vezu…</string>
     <string name="activity_icon">Aktivnost</string>
     <string name="add_to_cloud">Dodaj u %1$s</string>
+    <string name="advanced_settings">Napredna podešavanja</string>
+    <string name="appbar_search_in">Pretraga u %s</string>
+    <string name="assistant_screen_all_task_type">Sve</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Da li ste sigurni da želite da izbrišete ovaj zadatak?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Izbriši zadatak</string>
+    <string name="assistant_screen_failed_task_text">Nije uspelo</string>
+    <string name="assistant_screen_loading">Lista zadataka se učitava, molimo sačekajte</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Nijedan zadatak nije dostupan. Izaberite tip zadatka da biste kreirali novi zadatak.</string>
+    <string name="assistant_screen_no_task_available_text">Nijedan zadatak nije dostupan za %s tip zadatka, možete kreirati novi zadatak dole desno.</string>
+    <string name="assistant_screen_running_task_text">U toku</string>
+    <string name="assistant_screen_scheduled_task_status_text">Zakazano</string>
     <string name="assistant_screen_successful_task_text">Završeno</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Izbriši zadatak</string>
     <string name="associated_account_not_found">Pridruženi nalog nije nađen!</string>
     <string name="auth_access_failed">Neuspeo pristup: %1$s</string>
     <string name="auth_account_does_not_exist">Nalog još nije dodat na ovaj uređaj</string>
@@ -140,6 +154,7 @@
     <string name="create">Napravi</string>
     <string name="create_dir_fail_msg">Ne mogu da napravim fasciklu</string>
     <string name="create_new">Nov</string>
+    <string name="create_new_document">Novi dokument</string>
     <string name="create_new_folder">Nova fascikla</string>
     <string name="credentials_disabled">Akreditivi isključeni</string>
     <string name="default_credentials_wrong">Neispravni akreditivi</string>
@@ -304,6 +319,7 @@
     <string name="host_your_own_server">Hostujte sopstveni  server</string>
     <string name="instant_upload_on_charging">Otpremaj samo na punjenju</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="internal_two_way_sync">Interna dvosmerna sihronizacija</string>
     <string name="invisible">Nevidljiv</string>
     <string name="link">Veza</string>
     <string name="list_layout">Izlistani raspored</string>
@@ -554,6 +570,7 @@
     <string name="stream">Strimuj sa…</string>
     <string name="stream_not_possible_headline">Interno strimovanje nije moguće</string>
     <string name="stream_not_possible_message">Ili preuzmite multimediju ili koristite neku eksternu aplikaciju.</string>
+    <string name="sub_folder_rule_day">Godina/Mesec/Dan</string>
     <string name="subject_shared_with_you">„%1$s“ je podeljen sa vama</string>
     <string name="subject_user_shared_with_you">%1$s deli „%2$s“ sa vama</string>
     <string name="sync">Sinhronizuj</string>
@@ -588,7 +605,13 @@
     <string name="trashbin_file_not_deleted">Fajl %1$s ne može da se obriše!</string>
     <string name="trashbin_file_not_restored">Fajl %1$s ne može da se povrati!</string>
     <string name="trashbin_file_remove">Obriši zauvek</string>
+    <string name="trashbin_loading_failed">Učitavanje kante nije uspelo!</string>
     <string name="trashbin_not_emptied">Fajl ne može da se obriše nepovratno!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Onemogućiti za sve foldere</string>
+    <string name="two_way_sync_activity_empty_list_title">Dvosmerna sihronizacija nije podešena</string>
+    <string name="two_way_sync_activity_title">Interna dvosmerna sihronizacija</string>
+    <string name="unexpected_error_occurred">Desila se neočekivana greška</string>
+    <string name="unlock_file">Otključaj fajl</string>
     <string name="unread_comments">Postoje nepročitani komentari</string>
     <string name="unset_encrypted">Isključi šifrovanje</string>
     <string name="unshare_link_forbidden_permissions">da ukinete deljenje ovog fajla</string>