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

nextcloud · Oct 25, 2020 · 786c877 · 786c877
2 parents 22ae383 + ab659a1
commit 786c877
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
@@ -204,7 +204,7 @@
     <string name="downloader_not_downloaded_yet">Non ancora scaricato</string>
     <string name="drawer_close">Chiudi barra laterale</string>
     <string name="drawer_community">Comunità</string>
-    <string name="drawer_header_background">Immagine di sgondo sull\'intestazione del pacchetto</string>
+    <string name="drawer_header_background">Immagine di sfondo sull\'intestazione del cassetto</string>
     <string name="drawer_item_activities">Attività</string>
     <string name="drawer_item_all_files">Tutti i file</string>
     <string name="drawer_item_favorites">Preferiti</string>

diff --git a/src/main/res/values-mk/strings.xml b/src/main/res/values-mk/strings.xml
@@ -408,7 +408,9 @@
     <string name="move_file_invalid_into_descendent">Не е возможно да се копира папката во истата таа папка</string>
     <string name="move_file_invalid_overwrite">Датотеката веќе постои во папката</string>
     <string name="move_to">Премести во…</string>
+    <string name="network_error_connect_timeout_exception">Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши.</string>
     <string name="network_error_socket_exception">Настана грешка при обидот за поврзување со серверот</string>
+    <string name="network_error_socket_timeout_exception">Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши.</string>
     <string name="new_comment">Нов коментар…</string>
     <string name="new_media_folder_detected">Нова папка %1$s е детектирана.</string>
     <string name="new_media_folder_photos">слика</string>

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
@@ -142,7 +142,7 @@
     <string name="confirmation_remove_local">Tylko lokalnie</string>
     <string name="conflict_already_existing_file">Już istniejący plik</string>
     <string name="conflict_dialog_error">Błąd podczas tworzenia dialogu konfliktu!</string>
-    <string name="conflict_message_description">Jeśli wybierzesz obie wersje, to do lokalnego pliku będzie dodany numer.</string>
+    <string name="conflict_message_description">Jeśli wybierzesz obie wersje, to do nazwy pliku lokalnego zostanie dodany numer.</string>
     <string name="conflict_message_headline">Które pliki chcesz zachować?</string>
     <string name="conflict_new_file">Nowy plik</string>
     <string name="contaclist_restore_selected">Przywróć wybrane kontakty</string>