Merge remote-tracking branch 'origin/master'

2024-10-23 05:05:49 +03:00 · 2020-01-05 12:30:34 +01:00 · 2020-01-05 12:30:34 +01:00 · d1dee7b9b8
commit d1dee7b9b8
parent d7ca589e76 59d213d78a
41 changed files with 53 additions and 15 deletions
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@ -48,7 +48,6 @@
    <string name="error_sync">Synchronisation failed: %1$s</string>
    <string name="error_json">is the Notes app activated on the server?</string>
    <string name="error_no_network">no network connection</string>
-
    <!-- About -->
    <string name="about_version_title">Version</string>
    <string name="about_version">You are currently using &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -52,6 +52,7 @@
    <string name="error_sync">Ha fallat la sincronització: %1$s</string>
    <string name="error_json">l\'aplicació Notes està activada al servidor?</string>
    <string name="error_no_network">no hi ha connexió a la xarxa</string>
+    <string name="error_unknown">S\'ha produït un error desconegut</string>

    <!-- About -->
    <string name="about_version_title">Versió</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Synchronizace se nezdařila: %1$s</string>
    <string name="error_json">je na serveru aktivní aplikace Poznámky?</string>
    <string name="error_no_network">žádné síťové spojení</string>
+    <string name="error_files_app">máte nainstalovanou aplikaci Soubory?</string>
+    <string name="error_unknown">Vyskytla se neznámá chyba</string>

    <!-- About -->
    <string name="about_version_title">Verze</string>
--- a/app/src/main/res/values-cy-rGB/strings.xml
+++ b/app/src/main/res/values-cy-rGB/strings.xml
@ -47,7 +47,6 @@
    <string name="error_sync">Methodd y cydweddiad: %1$s</string>
    <string name="error_json">A yw\'r ap Nodiadau yn weithredol ar y gweinydd?</string>
    <string name="error_no_network">dim cysylltiad rthwydwaith</string>
-
    <!-- About -->
    <string name="about_version_title">Fersiwn</string>
    <string name="about_version">Ar hyn o bryd rydych yn defnyddio &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -48,6 +48,7 @@
    <string name="error_sync">Synkronisering fejlede: %1$s</string>
    <string name="error_json">er Notes appen aktiveret på serveren?</string>
    <string name="error_no_network">ingen netværksforbindelse</string>
+    <string name="error_unknown">En ukendt fejl er opstået</string>

    <!-- About -->
    <string name="about_version_title">Version</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Synchronisation fehlgeschlagen: %1$s</string>
    <string name="error_json">ist die Notes-App auf dem Server aktiviert?</string>
    <string name="error_no_network">keine Netzwerk-Verbindung</string>
+    <string name="error_files_app">Haben Sie die Dateien-App installiert?</string>
+    <string name="error_unknown">Unbekannter Fehler aufgetreten</string>

    <!-- About -->
    <string name="about_version_title">Version</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Αποτυχία συγχρονισμού: %1$s</string>
    <string name="error_json">Είναι η εφαρμογή Σημειώσεις ενεργοποιημένη στον εξυπηρετητή Nextcloud;</string>
    <string name="error_no_network">δεν υπάρχει σύνδεση δικτύου</string>
+    <string name="error_files_app">εγκαταστάθηκε η εφαρμογή αρχείων?</string>
+    <string name="error_unknown">Ένα άγνωστο σφάλμα προέκυψε</string>

    <!-- About -->
    <string name="about_version_title">Έκδοση</string>
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@ -41,7 +41,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@ -39,7 +39,6 @@
    <string name="error_sync">Falló la sincronización: %1$s</string>
    <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
    <string name="error_no_network">no hay conexión a red</string>
-
    <!-- About -->
    <string name="about_version_title">Versión</string>
    <string name="about_version">Actualmente estás usando &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Fallo en la sincronización: %1$s</string>
    <string name="error_json">¿Está la app de Notas activada en el servidor?</string>
    <string name="error_no_network">no hay conexión a la red</string>
+    <string name="error_files_app">¿Ha instalado los archivos de la aplicación?</string>
+    <string name="error_unknown">Ha ocurrido un error desconocido</string>

    <!-- About -->
    <string name="about_version_title">Versión</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Sinkronizazioa huts egin du: %1$s</string>
    <string name="error_json">Oharrak aplikazioa zerbitzariak aktibatuta al dago?</string>
    <string name="error_no_network">Ez dago sare-konexiorik</string>
+    <string name="error_files_app">fitxategien aplikazioa instalatu al duzu?</string>
+    <string name="error_unknown">Errore ezezagun bat gertatu da</string>

    <!-- About -->
    <string name="about_version_title">Bertsioa</string>
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@ -50,6 +50,7 @@
    <!-- Error -->
    <string name="error_sync">Synkronointi epäonnistui: %1$s</string>
    <string name="error_no_network">ei verkkoyhteyttä</string>
+    <string name="error_unknown">Tapahtui tuntematon virhe</string>

    <!-- About -->
    <string name="about_version_title">Versio</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Échec de synchronisation : %1$s</string>
    <string name="error_json">Est-ce que l\'application Notes est activée sur le serveur ?</string>
    <string name="error_no_network">pas de connexion réseau</string>
+    <string name="error_files_app">Avez-vous installé l\'appli Fichiers ?</string>
+    <string name="error_unknown">Une erreur inconnue est survenue</string>

    <!-- About -->
    <string name="about_version_title">Version</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -51,7 +51,9 @@
    <!-- Error -->
    <string name="error_sync">Produciuse un fallo na sincronización: %1$s</string>
    <string name="error_json">está activada a aplicación «Notes» no servidor?</string>
-    <string name="error_no_network">Sen conexión de rede</string>
+    <string name="error_no_network">sen conexión de rede</string>
+    <string name="error_files_app">instalou a aplicación de ficheiros?</string>
+    <string name="error_unknown">Produciuse un erro descoñecido</string>

    <!-- About -->
    <string name="about_version_title">Versión</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -48,6 +48,7 @@
    <string name="error_sync">הסנכרון נכשל: %1$s</string>
    <string name="error_json">האם יישומון הפתקים מופעל בשרת?</string>
    <string name="error_no_network">אין חיבור לרשת</string>
+    <string name="error_unknown">אירעה שגיאה בלתי ידועה</string>

    <!-- About -->
    <string name="about_version_title">גרסה</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -52,6 +52,7 @@
    <string name="error_sync">Sinkronizacija nije uspjela: %1$s</string>
    <string name="error_json">je li aplikacija Bilješke aktivirana na poslužitelju?</string>
    <string name="error_no_network">nema veze s mrežom</string>
+    <string name="error_unknown">Došlo je do nepoznate pogreške</string>

    <!-- About -->
    <string name="about_version_title">Inačica</string>
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@ -50,6 +50,7 @@
    <string name="error_sync">sikertelen szinkronizálás: %1$s</string>
    <string name="error_json">be van kapcsolva a Jegyzetek app a szerveren?</string>
    <string name="error_no_network">Nincs hálózati kapcsolat</string>
+    <string name="error_unknown">Ismeretlen hiba történt</string>

    <!-- About -->
    <string name="about_version_title">Verzió</string>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@ -48,6 +48,7 @@
    <string name="error_sync">Samstilling mistókst: %1$s</string>
    <string name="error_json">er minnispunktaforritið virkt á þjóninum?</string>
    <string name="error_no_network">engin nettenging</string>
+    <string name="error_unknown">Óþekkt villa kom upp</string>

    <!-- About -->
    <string name="about_version_title">Útgáfa</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Sincronizzazione non riuscita: %1$s</string>
    <string name="error_json">L\'applicazione Notes è stata attivata sul server?</string>
    <string name="error_no_network">nessuna connessione di rete</string>
+    <string name="error_files_app">hai installato l\'applicazione File?</string>
+    <string name="error_unknown">Si è verificato un errore sconosciuto</string>

    <!-- About -->
    <string name="about_version_title">Versione</string>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">同期に失敗しました: %1$s</string>
    <string name="error_json">ノートアプリはサーバー上で有効になっていますか?</string>
    <string name="error_no_network">ネットワーク接続がありません</string>
+    <string name="error_files_app">ファイルアプリはインストールしましたか？</string>
+    <string name="error_unknown">不明なエラーが発生しました</string>

    <!-- About -->
    <string name="about_version_title">バージョン</string>
@ -104,8 +106,12 @@
    <string name="add_account">アカウントを追加</string>
    <string name="category_music">音楽</string>
    <string name="category_movies">動画</string>
+    <string name="category_movie">ムービー</string>
    <string name="category_work">業種</string>
+    <string name="account_already_imported">アカウントはすでにインポートされています</string>
    <string name="no_notes_yet">まだノートはありません</string>
+    <string name="no_notes_yet_description">+ ボタンを押して新しいノートを作成</string>
+
    <!-- Array: note modes -->
    <string-array name="noteMode_entries">
        <item>編集モードで開く</item>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -36,7 +36,6 @@
    <string name="error_sync">동기화 실패: %1$s</string>
    <string name="error_json">서버에 메모 앱이 활성화되어 있습니까?</string>
    <string name="error_no_network">네트워크 연결 없음</string>
-
    <!-- About -->
    <string name="about_version_title">버전</string>
    <string name="about_version">&lt;strong>%1$s&lt;/strong> 사용 중</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Sinchronizacija nepavyko: %1$s</string>
    <string name="error_json">Ar užrašų programėlė aktyvuota serveryje?</string>
    <string name="error_no_network">nėra tinklo ryšio</string>
+    <string name="error_files_app">ar esate įdiegę failų programėlę?</string>
+    <string name="error_unknown">Įvyko nežinoma klaida</string>

    <!-- About -->
    <string name="about_version_title">Versija</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -52,6 +52,7 @@
    <string name="error_sync">Synkronisering mislyktes: %1$s</string>
    <string name="error_json">er Notat-appen påslått på serveren?</string>
    <string name="error_no_network">Ingen nettverkstilkobling</string>
+    <string name="error_unknown">En ukjent feil oppstod</string>

    <!-- About -->
    <string name="about_version_title">Versjon</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -53,6 +53,8 @@
    <string name="error_sync">Synchronisatie mislukt: %1$s</string>
    <string name="error_json">is de Notities app op de server geactiveerd?</string>
    <string name="error_no_network">geen netwerkverbinding</string>
+    <string name="error_files_app">hen je de Bestanden app geïnstalleerd?</string>
+    <string name="error_unknown">Er trad een onbekende fout op.</string>

    <!-- About -->
    <string name="about_version_title">Versie</string>
@ -105,6 +107,7 @@
    <string name="add_account">Account toevoegen</string>
    <string name="category_music">Muziek</string>
    <string name="category_movies">Films</string>
+    <string name="category_movie">Film</string>
    <string name="category_work">Werk</string>
    <string name="no_notes_yet">Nog geen notities</string>
    <!-- Array: note modes -->
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Synchronizacja nie powiodła się: %1$s</string>
    <string name="error_json">czy aplikacja Notes jest aktywowana na serwerze?</string>
    <string name="error_no_network">brak połączenia sieciowego</string>
+    <string name="error_files_app">czy masz zainstalowaną aplikację plików?</string>
+    <string name="error_unknown">Wystąpił nieznany błąd</string>

    <!-- About -->
    <string name="about_version_title">Wersja</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">A sincronização falhou: %1$s</string>
    <string name="error_json">O aplicativo Notes está ativado no servidor?</string>
    <string name="error_no_network">não existe conexão de rede</string>
+    <string name="error_files_app">Você instalou o aplicativo files?</string>
+    <string name="error_unknown">Um erro desconhecido ocorreu</string>

    <!-- About -->
    <string name="about_version_title">Versão</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -48,6 +48,7 @@
    <string name="error_sync">Синхронизация не удалась: %1$s</string>
    <string name="error_json">Включено ли приложение «Заметки» на сервере?</string>
    <string name="error_no_network">нет подключения к сети</string>
+    <string name="error_unknown">Произошла неизвестная ошибка</string>

    <!-- About -->
    <string name="about_version_title">Версия</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Synchronizácia zlyhala: %1$s</string>
    <string name="error_json">máte povolenú aplikáciu Poznámky na serveri?</string>
    <string name="error_no_network">nie je pripojenie k sieti</string>
+    <string name="error_files_app">máte nainštalovanú apku Súbory?</string>
+    <string name="error_unknown">Vyskytla sa neznáma chyba</string>

    <!-- About -->
    <string name="about_version_title">Verzia</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -52,6 +52,7 @@
    <string name="error_sync">Usklajevanje je spodletelo: %1$s</string>
    <string name="error_json">Ali je program Beležka Notes nameščen na strežniku?</string>
    <string name="error_no_network">ni omrežne povezave</string>
+    <string name="error_unknown">Prišlo je do neznane napake!</string>

    <!-- About -->
    <string name="about_version_title">Različica</string>
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@ -42,7 +42,6 @@
    <string name="error_sync">Sinkronizimi dështoi: %1$s</string>
    <string name="error_json">a është aplikacioni i Notes i aktivizuar në server?</string>
    <string name="error_no_network">asnjë lidhje në rrjet</string>
-
    <!-- About -->
    <string name="about_version_title">Versioni</string>
    <string name="about_version">Ju tani jeni duke përdorur &lt;strong>%1$s&lt;/strong></string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -52,6 +52,7 @@
    <string name="error_sync">Синхронизација није успела%1$s</string>
    <string name="error_json">Да ли је апликација Белешки активирана на серверу?</string>
    <string name="error_no_network">нема мрежне везе</string>
+    <string name="error_unknown">Десила се непозната грешка</string>

    <!-- About -->
    <string name="about_version_title">Верзија</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Synkronisering misslyckades: %1$s</string>
    <string name="error_json">är anteckningar-appen aktiverad på servern?</string>
    <string name="error_no_network">ingen nätverksanslutning</string>
+    <string name="error_files_app">har du installerat filappen?</string>
+    <string name="error_unknown">Ett okänt fel uppstod</string>

    <!-- About -->
    <string name="about_version_title">Version</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">Eşitlenemedi: %1$s</string>
    <string name="error_json">Notlar uygulaması sunucu üzerinde etkinleştirilmiş mi?</string>
    <string name="error_no_network">ağ bağlantısı yok</string>
+    <string name="error_files_app">dosyalar uygulamasını kurdunuz mu?</string>
+    <string name="error_unknown">Bilinmeyen bir sorun çıktı</string>

    <!-- About -->
    <string name="about_version_title">Sürüm</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -52,6 +52,8 @@
    <string name="error_sync">同步失败：%1$s</string>
    <string name="error_json">服务器上的笔记应用是否启用？</string>
    <string name="error_no_network">没有网络连接</string>
+    <string name="error_files_app">您是否已安装 文件 应用程序？</string>
+    <string name="error_unknown">发生了未知错误。</string>

    <!-- About -->
    <string name="about_version_title">版本</string>
@ -93,7 +95,7 @@

    <string name="pref_value_theme_light">浅色主题</string>
    <string name="pref_value_font_normal">普通</string>
-    <string name="pref_value_wifi_and_mobile">在有Wi-Fi和移动数据时同步</string>
+    <string name="pref_value_wifi_and_mobile">在有 Wi-Fi 和移动数据网络时同步</string>
    <string name="simple_error">错误</string>
    <string name="simple_close">关闭</string>
    <string name="simple_copy">复制</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -53,7 +53,7 @@
    <string name="error_json">is the Notes app activated on the server?</string>
    <string name="error_no_network">no network connection</string>
    <string name="error_files_app">do you have installed the files app?</string>
-    <string name="error_unknown">an unknown error happened.</string>
+    <string name="error_unknown">An unknown error has occurred</string>

    <!-- Snackbar Actions -->