diff options
81 files changed, 539 insertions, 121 deletions
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index 6882475e972..0776a84ceb4 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -79,7 +79,7 @@ class StatusController extends Controller { case Session::NOT_INITIALIZED: $status = 'interactionNeeded'; $message = (string)$this->l->t( - 'Encryption app is enabled but your keys are not initialized, please log-out and log-in again' + 'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.' ); break; case Session::INIT_SUCCESSFUL: diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php index 2ea55e15c80..6ab4bf6f5f4 100644 --- a/apps/encryption/templates/settings-personal.php +++ b/apps/encryption/templates/settings-personal.php @@ -9,7 +9,7 @@ script('core', 'multiselect'); <?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?> - <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?> + <?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?> <?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?> <p> diff --git a/apps/federatedfilesharing/l10n/nb.js b/apps/federatedfilesharing/l10n/nb.js index a2a0bcbdc0c..4a08fca28ba 100644 --- a/apps/federatedfilesharing/l10n/nb.js +++ b/apps/federatedfilesharing/l10n/nb.js @@ -27,7 +27,11 @@ OC.L10N.register( "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s", "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", "File is already shared with %s" : "Filen er allerede delt med %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Deling %s feilet, kunne ikke finne %s, kanskje tjeneren foreøyeblikket er utilgjengelig eller bruker selv-signert sertifikat.", "Could not find share" : "Kunne ikke finne ressurs", + "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du har mottatt \"%3$s\" som en ekstern deling fra %1$s (på vegne av %2$s)", + "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du har mottatt {share} som en ekstern deling fra {user} (på vegne av {behalf})", + "You received \"%3$s\" as a remote share from %1$s" : "Du har mottatt \"%3$s\" som en ekstern deling fra %1$s", "You received {share} as a remote share from {user}" : "Du mottok {share} som en fjerndeling fra {user}", "Accept" : "Aksepter", "Decline" : "Avslå", @@ -37,6 +41,7 @@ OC.L10N.register( "Open documentation" : "Åpne dokumentasjonen", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne tjeneren sender delinger til andre tjenere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne tjeneren mottar delinger fra andre tjenere", + "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", diff --git a/apps/federatedfilesharing/l10n/nb.json b/apps/federatedfilesharing/l10n/nb.json index ab5cfe57fbf..9978ec26636 100644 --- a/apps/federatedfilesharing/l10n/nb.json +++ b/apps/federatedfilesharing/l10n/nb.json @@ -25,7 +25,11 @@ "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s", "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", "File is already shared with %s" : "Filen er allerede delt med %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Deling %s feilet, kunne ikke finne %s, kanskje tjeneren foreøyeblikket er utilgjengelig eller bruker selv-signert sertifikat.", "Could not find share" : "Kunne ikke finne ressurs", + "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du har mottatt \"%3$s\" som en ekstern deling fra %1$s (på vegne av %2$s)", + "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du har mottatt {share} som en ekstern deling fra {user} (på vegne av {behalf})", + "You received \"%3$s\" as a remote share from %1$s" : "Du har mottatt \"%3$s\" som en ekstern deling fra %1$s", "You received {share} as a remote share from {user}" : "Du mottok {share} som en fjerndeling fra {user}", "Accept" : "Aksepter", "Decline" : "Avslå", @@ -35,6 +39,7 @@ "Open documentation" : "Åpne dokumentasjonen", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne tjeneren sender delinger til andre tjenere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne tjeneren mottar delinger fra andre tjenere", + "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", diff --git a/apps/federation/l10n/nb.js b/apps/federation/l10n/nb.js index 6400c199bee..02f9e339b9b 100644 --- a/apps/federation/l10n/nb.js +++ b/apps/federation/l10n/nb.js @@ -6,6 +6,7 @@ OC.L10N.register( "No server to federate with found" : "Ingen tjener å forene med ble funnet", "Could not add server" : "Kunne ikke legge til tjener", "Federation" : "Sammenknytting", + "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Føderasjon tillater deg å koble sammen andre betrodde tjenere for utviksling av bruker kataloger. For eksempel vil det bli brukt for autofullføring av eksterne brukere for føderal deling.", "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", "Trusted servers" : "Klarerte tjenere", "+ Add trusted server" : "+ Legg til klarert tjener", diff --git a/apps/federation/l10n/nb.json b/apps/federation/l10n/nb.json index cdd62ad35f2..3a047793ae8 100644 --- a/apps/federation/l10n/nb.json +++ b/apps/federation/l10n/nb.json @@ -4,6 +4,7 @@ "No server to federate with found" : "Ingen tjener å forene med ble funnet", "Could not add server" : "Kunne ikke legge til tjener", "Federation" : "Sammenknytting", + "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Føderasjon tillater deg å koble sammen andre betrodde tjenere for utviksling av bruker kataloger. For eksempel vil det bli brukt for autofullføring av eksterne brukere for føderal deling.", "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", "Trusted servers" : "Klarerte tjenere", "+ Add trusted server" : "+ Legg til klarert tjener", diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index 745235de08d..4edf2cdbc66 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -45,6 +45,7 @@ OC.L10N.register( "Could not create file \"{file}\" because it already exists" : "Gat ekki búið til skrána \"{file}\" vegna þess að hún er þegar til", "Could not create folder \"{dir}\" because it already exists" : "Gat ekki búið til möppuna \"{dir}\" vegna þess að hún er þegar til", "Error deleting file \"{fileName}\"." : "Villa við að eyða skránni \"{fileName}\".", + "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}", "Name" : "Heiti", "Size" : "Stærð", "Modified" : "Breytt", @@ -57,6 +58,7 @@ OC.L10N.register( "New" : "Nýtt", "\"{name}\" is an invalid file name." : "\"{name}\" er ógilt skráarheiti.", "File name cannot be empty." : "Heiti skráar má ekki vera tómt", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ógild skráartegund", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Geymslupláss {owner} er fullt, ekki er lengur hægt að uppfæra eða samstilla skrár!", "Your storage is full, files can not be updated or synced anymore!" : "Geymsluplássið þitt er fullt, ekki er lengur hægt að uppfæra eða samstilla skrár!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Geymslupláss {owner} er næstum fullt ({usedSpacePercent}%)", diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index 578732b6505..c07bae1d0f8 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -43,6 +43,7 @@ "Could not create file \"{file}\" because it already exists" : "Gat ekki búið til skrána \"{file}\" vegna þess að hún er þegar til", "Could not create folder \"{dir}\" because it already exists" : "Gat ekki búið til möppuna \"{dir}\" vegna þess að hún er þegar til", "Error deleting file \"{fileName}\"." : "Villa við að eyða skránni \"{fileName}\".", + "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}", "Name" : "Heiti", "Size" : "Stærð", "Modified" : "Breytt", @@ -55,6 +56,7 @@ "New" : "Nýtt", "\"{name}\" is an invalid file name." : "\"{name}\" er ógilt skráarheiti.", "File name cannot be empty." : "Heiti skráar má ekki vera tómt", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ógild skráartegund", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Geymslupláss {owner} er fullt, ekki er lengur hægt að uppfæra eða samstilla skrár!", "Your storage is full, files can not be updated or synced anymore!" : "Geymsluplássið þitt er fullt, ekki er lengur hægt að uppfæra eða samstilla skrár!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Geymslupláss {owner} er næstum fullt ({usedSpacePercent}%)", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index dc6c0705804..6e48f5abf8a 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -58,6 +58,7 @@ OC.L10N.register( "New" : "新規作成", "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。", "File name cannot be empty." : "ファイル名を空にすることはできません。", + "\"{name}\" is not an allowed filetype" : "\"{name}\" は無効なファイル形式です", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！", "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} のストレージはほぼ一杯です。({usedSpacePercent}%)", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 13a84e3772f..e0f148d15bf 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -56,6 +56,7 @@ "New" : "新規作成", "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。", "File name cannot be empty." : "ファイル名を空にすることはできません。", + "\"{name}\" is not an allowed filetype" : "\"{name}\" は無効なファイル形式です", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！", "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} のストレージはほぼ一杯です。({usedSpacePercent}%)", diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js index 4726bc8be27..cc86386d9c8 100644 --- a/apps/files/l10n/nb.js +++ b/apps/files/l10n/nb.js @@ -45,6 +45,7 @@ OC.L10N.register( "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede", "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede", "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "Name" : "Navn", "Size" : "Størrelse", "Modified" : "Endret", @@ -57,6 +58,7 @@ OC.L10N.register( "New" : "Ny", "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)", @@ -173,6 +175,9 @@ OC.L10N.register( "%2$s restored %1$s" : "%2$s gjenopprettet %1$s", "Changed by %2$s" : "Endret av %2$s", "Deleted by %2$s" : "Slettet av %2$s", - "Restored by %2$s" : "Gjenopprettet av %2$s" + "Restored by %2$s" : "Gjenopprettet av %2$s", + "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} time igjen","{hours}:{minutes}:{seconds} timer igjen"], + "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minutt igjen","{minutes}:{seconds} minutter igjen"], + "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} sekund igjen","{seconds} sekunder igjen"] }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json index 0fb4e6bdd7f..7057a26fc8a 100644 --- a/apps/files/l10n/nb.json +++ b/apps/files/l10n/nb.json @@ -43,6 +43,7 @@ "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede", "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede", "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "Name" : "Navn", "Size" : "Størrelse", "Modified" : "Endret", @@ -55,6 +56,7 @@ "New" : "Ny", "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)", @@ -171,6 +173,9 @@ "%2$s restored %1$s" : "%2$s gjenopprettet %1$s", "Changed by %2$s" : "Endret av %2$s", "Deleted by %2$s" : "Slettet av %2$s", - "Restored by %2$s" : "Gjenopprettet av %2$s" + "Restored by %2$s" : "Gjenopprettet av %2$s", + "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} time igjen","{hours}:{minutes}:{seconds} timer igjen"], + "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minutt igjen","{minutes}:{seconds} minutter igjen"], + "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} sekund igjen","{seconds} sekunder igjen"] },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index bb24bf6bb88..5f8e2c88d1f 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -58,6 +58,7 @@ OC.L10N.register( "New" : "新建", "\"{name}\" is an invalid file name." : "\"{name}\" 是一个无效的文件名", "File name cannot be empty." : "文件名不能为空.", + "\"{name}\" is not an allowed filetype" : "\"{name}\" 不是允许的文件类型", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满, 文件将无法更新或同步!", "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满, 文件将无法更新或同步!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index a0a6955e819..487d3bf29e1 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -56,6 +56,7 @@ "New" : "新建", "\"{name}\" is an invalid file name." : "\"{name}\" 是一个无效的文件名", "File name cannot be empty." : "文件名不能为空.", + "\"{name}\" is not an allowed filetype" : "\"{name}\" 不是允许的文件类型", "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满, 文件将无法更新或同步!", "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满, 文件将无法更新或同步!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)", diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js new file mode 100644 index 00000000000..a288544ce45 --- /dev/null +++ b/apps/files_external/l10n/sk.js @@ -0,0 +1,100 @@ +OC.L10N.register( + "files_external", + { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Sťahovanie tokenov požiadavky zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Sťahovanie prístupových tokenov zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.", + "Please provide a valid app key and secret." : "Zadajte prosím platný aplikačný kľúč a heslo (secret).", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", + "External storage" : "Externé úložisko", + "Dropbox App Configuration" : "Nastavenie Dropbox aplikácie", + "Google Drive App Configuration" : "Nastavenie Google Drive aplikácie", + "Personal" : "Osobné", + "System" : "Systém", + "Grant access" : "Povoliť prístup", + "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", + "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", + "Generate keys" : "Vytvoriť kľúče", + "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", + "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", + "(group)" : "(skupina)", + "Saved" : "Uložené", + "Save" : "Uložiť", + "Username" : "Používateľské meno", + "Password" : "Heslo", + "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo", + "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie", + "Invalid mount point" : "Chybný prípojný bod", + "Objectstore forbidden" : "Objectstore je zakáazaný", + "Invalid storage backend \"%s\"" : "Neplatný backend úložiska \"%s\"", + "Not permitted to use backend \"%s\"" : "Nie je povolené použiť backend \"%s\"", + "Not permitted to use authentication mechanism \"%s\"" : "Nie je povolené použiť autentifikačný mechanizmus \"%s\"", + "Unsatisfied backend parameters" : "Nedostatočné parametre backendu", + "Unsatisfied authentication mechanism parameters" : "Nedostatočné parametre autentifikačného mechanizmu", + "Access key" : "Prístupový kľúč", + "Secret key" : "Tajný kľúč", + "Builtin" : "Vstavaný", + "None" : "Žiadny", + "OAuth1" : "OAuth1", + "App key" : "Kľúč aplikácie", + "App secret" : "Heslo aplikácie", + "OAuth2" : "OAuth2", + "Client ID" : "Client ID", + "Client secret" : "Heslo klienta", + "OpenStack" : "OpenStack", + "Tenant name" : "Meno nájomcu", + "Identity endpoint URL" : "Endpoint URL identita", + "Rackspace" : "Rackspace", + "API key" : "API kľúč", + "Global credentials" : "Globálne oprávnenia", + "Username and password" : "Meno a heslo", + "RSA public key" : "RSA verejný kľúč", + "Public key" : "Verejný kľúč", + "Amazon S3" : "Amazon S3", + "Bucket" : "Sektor", + "Hostname" : "Hostname", + "Port" : "Port", + "Region" : "Región", + "Enable SSL" : "Povoliť SSL", + "Enable Path Style" : "Povoliť štýl cesty", + "WebDAV" : "WebDAV", + "URL" : "URL", + "Remote subfolder" : "Vzdialený podpriečinok", + "Secure https://" : "Zabezpečené https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", + "Host" : "Hostiteľ", + "Secure ftps://" : "Zabezpečené ftps://", + "Google Drive" : "Google Drive", + "Local" : "Lokálny", + "Location" : "Umiestnenie", + "SFTP" : "SFTP", + "Root" : "Root", + "SMB / CIFS" : "SMB / CIFS", + "Share" : "Sprístupniť", + "Domain" : "Doména", + "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia", + "Username as share" : "Používateľské meno ako sprístupnený priečinok", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Názov služby", + "Request timeout (seconds)" : "Timeout požiadavky (s)", + "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", + "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", + "Name" : "Názov", + "Storage type" : "Typ úložiska", + "Scope" : "Rozsah", + "Enable encryption" : "Povoliť šifrovanie", + "Enable previews" : "Povoliť náhľady", + "Check for changes" : "Zisťovať zmeny", + "Never" : "Nikdy", + "Once every direct access" : "S každým priamym prístupom", + "Folder name" : "Názov priečinka", + "Authentication" : "Autentifikácia", + "Configuration" : "Nastavenia", + "Available for" : "K dispozícii pre", + "Add storage" : "Pridať úložisko", + "Advanced settings" : "Rozšírené nastavenia", + "Delete" : "Zmazať", + "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská" +}, +"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json new file mode 100644 index 00000000000..24592565e8e --- /dev/null +++ b/apps/files_external/l10n/sk.json @@ -0,0 +1,98 @@ +{ "translations": { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Sťahovanie tokenov požiadavky zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Sťahovanie prístupových tokenov zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.", + "Please provide a valid app key and secret." : "Zadajte prosím platný aplikačný kľúč a heslo (secret).", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", + "External storage" : "Externé úložisko", + "Dropbox App Configuration" : "Nastavenie Dropbox aplikácie", + "Google Drive App Configuration" : "Nastavenie Google Drive aplikácie", + "Personal" : "Osobné", + "System" : "Systém", + "Grant access" : "Povoliť prístup", + "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", + "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", + "Generate keys" : "Vytvoriť kľúče", + "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", + "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", + "(group)" : "(skupina)", + "Saved" : "Uložené", + "Save" : "Uložiť", + "Username" : "Používateľské meno", + "Password" : "Heslo", + "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo", + "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie", + "Invalid mount point" : "Chybný prípojný bod", + "Objectstore forbidden" : "Objectstore je zakáazaný", + "Invalid storage backend \"%s\"" : "Neplatný backend úložiska \"%s\"", + "Not permitted to use backend \"%s\"" : "Nie je povolené použiť backend \"%s\"", + "Not permitted to use authentication mechanism \"%s\"" : "Nie je povolené použiť autentifikačný mechanizmus \"%s\"", + "Unsatisfied backend parameters" : "Nedostatočné parametre backendu", + "Unsatisfied authentication mechanism parameters" : "Nedostatočné parametre autentifikačného mechanizmu", + "Access key" : "Prístupový kľúč", + "Secret key" : "Tajný kľúč", + "Builtin" : "Vstavaný", + "None" : "Žiadny", + "OAuth1" : "OAuth1", + "App key" : "Kľúč aplikácie", + "App secret" : "Heslo aplikácie", + "OAuth2" : "OAuth2", + "Client ID" : "Client ID", + "Client secret" : "Heslo klienta", + "OpenStack" : "OpenStack", + "Tenant name" : "Meno nájomcu", + "Identity endpoint URL" : "Endpoint URL identita", + "Rackspace" : "Rackspace", + "API key" : "API kľúč", + "Global credentials" : "Globálne oprávnenia", + "Username and password" : "Meno a heslo", + "RSA public key" : "RSA verejný kľúč", + "Public key" : "Verejný kľúč", + "Amazon S3" : "Amazon S3", + "Bucket" : "Sektor", + "Hostname" : "Hostname", + "Port" : "Port", + "Region" : "Región", + "Enable SSL" : "Povoliť SSL", + "Enable Path Style" : "Povoliť štýl cesty", + "WebDAV" : "WebDAV", + "URL" : "URL", + "Remote subfolder" : "Vzdialený podpriečinok", + "Secure https://" : "Zabezpečené https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", + "Host" : "Hostiteľ", + "Secure ftps://" : "Zabezpečené ftps://", + "Google Drive" : "Google Drive", + "Local" : "Lokálny", + "Location" : "Umiestnenie", + "SFTP" : "SFTP", + "Root" : "Root", + "SMB / CIFS" : "SMB / CIFS", + "Share" : "Sprístupniť", + "Domain" : "Doména", + "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia", + "Username as share" : "Používateľské meno ako sprístupnený priečinok", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Názov služby", + "Request timeout (seconds)" : "Timeout požiadavky (s)", + "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", + "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", + "Name" : "Názov", + "Storage type" : "Typ úložiska", + "Scope" : "Rozsah", + "Enable encryption" : "Povoliť šifrovanie", + "Enable previews" : "Povoliť náhľady", + "Check for changes" : "Zisťovať zmeny", + "Never" : "Nikdy", + "Once every direct access" : "S každým priamym prístupom", + "Folder name" : "Názov priečinka", + "Authentication" : "Autentifikácia", + "Configuration" : "Nastavenia", + "Available for" : "K dispozícii pre", + "Add storage" : "Pridať úložisko", + "Advanced settings" : "Rozšírené nastavenia", + "Delete" : "Zmazať", + "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská" +},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" +}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/cs.js b/apps/files_sharing/l10n/cs.js index 6964eb5eabc..8a9f8ab4ead 100644 --- a/apps/files_sharing/l10n/cs.js +++ b/apps/files_sharing/l10n/cs.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} odebral(a) sdílení", "You shared {file} with {user}" : "Sdílel(a) jste {file} s {user}", "You removed {user} from {file}" : "Odstranil(a) jste uživatele {user} z {file}", + "{actor} shared {file} with {user}" : "{actor} s {user} sdílel(a) {file}", "{actor} removed {user} from {file}" : "{actor} odstranil(a) uživatele {user} z {file}", "{actor} shared {file} with you" : "{actor} s vámi sdílel(a) soubor {file}", "{actor} removed you from {file}" : "{actor} vás odstranil(a) ze souboru {file}", @@ -78,6 +79,8 @@ OC.L10N.register( "Public upload is only possible for publicly shared folders" : "Veřejné nahrávání je možné pouze do veřejně sdílených adresářů", "Invalid date, date format must be YYYY-MM-DD" : "Neplatné datum, formát data musí být YYY-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", + "You cannot share to a Circle if the app is not enabled" : "Do kruhu nemůžete sdílet, pokud není aplikace povolena", + "Please specify a valid circle" : "Prosím, specifikujte platný kruh", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", "Could not lock path" : "Nepodařilo se uzamknout cestu", diff --git a/apps/files_sharing/l10n/cs.json b/apps/files_sharing/l10n/cs.json index 2ee5d1fc0eb..774672122f6 100644 --- a/apps/files_sharing/l10n/cs.json +++ b/apps/files_sharing/l10n/cs.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} odebral(a) sdílení", "You shared {file} with {user}" : "Sdílel(a) jste {file} s {user}", "You removed {user} from {file}" : "Odstranil(a) jste uživatele {user} z {file}", + "{actor} shared {file} with {user}" : "{actor} s {user} sdílel(a) {file}", "{actor} removed {user} from {file}" : "{actor} odstranil(a) uživatele {user} z {file}", "{actor} shared {file} with you" : "{actor} s vámi sdílel(a) soubor {file}", "{actor} removed you from {file}" : "{actor} vás odstranil(a) ze souboru {file}", @@ -76,6 +77,8 @@ "Public upload is only possible for publicly shared folders" : "Veřejné nahrávání je možné pouze do veřejně sdílených adresářů", "Invalid date, date format must be YYYY-MM-DD" : "Neplatné datum, formát data musí být YYY-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", + "You cannot share to a Circle if the app is not enabled" : "Do kruhu nemůžete sdílet, pokud není aplikace povolena", + "Please specify a valid circle" : "Prosím, specifikujte platný kruh", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", "Could not lock path" : "Nepodařilo se uzamknout cestu", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index f89a87b380e..78f8edcce09 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} hat die Freigabe entfernt", "You shared {file} with {user}" : "Du hast {file} mit {user} geteilt", "You removed {user} from {file}" : "Du hast {user} von {file} entfernt", + "{actor} shared {file} with {user}" : "{actor} hat {file} mit {user} geteilt", "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt", "{actor} shared {file} with you" : "{actor} hat {file} mit dir geteilt", "{actor} removed you from {file}" : "Du wurdest durch {actor} von {file} entfernt", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 6ecd1f9b231..1c3e07c50c2 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} hat die Freigabe entfernt", "You shared {file} with {user}" : "Du hast {file} mit {user} geteilt", "You removed {user} from {file}" : "Du hast {user} von {file} entfernt", + "{actor} shared {file} with {user}" : "{actor} hat {file} mit {user} geteilt", "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt", "{actor} shared {file} with you" : "{actor} hat {file} mit dir geteilt", "{actor} removed you from {file}" : "Du wurdest durch {actor} von {file} entfernt", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 6645b905b39..f65c3f4f6b8 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} hat die Freigabe entfernt", "You shared {file} with {user}" : "Sie haben {file} mit {user} geteilt", "You removed {user} from {file}" : "Sie haben {user} von {file} entfernt", + "{actor} shared {file} with {user}" : "{actor} hat {file} mit {user} geteilt", "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt", "{actor} shared {file} with you" : "{actor} hat {file} mit Ihnen geteilt", "{actor} removed you from {file}" : "Sie wurden durch {actor} von {file} entfernt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 5a71533ac0d..c8b87450a02 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} hat die Freigabe entfernt", "You shared {file} with {user}" : "Sie haben {file} mit {user} geteilt", "You removed {user} from {file}" : "Sie haben {user} von {file} entfernt", + "{actor} shared {file} with {user}" : "{actor} hat {file} mit {user} geteilt", "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt", "{actor} shared {file} with you" : "{actor} hat {file} mit Ihnen geteilt", "{actor} removed you from {file}" : "Sie wurden durch {actor} von {file} entfernt", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 8976f9be0ca..478c91aa96e 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} eliminó el recurso compartido", "You shared {file} with {user}" : "Ha compartido {file} con {user}", "You removed {user} from {file}" : "Ha eliminado {user} de {file}", + "{actor} shared {file} with {user}" : "{actor} compartió {file} con {user}", "{actor} removed {user} from {file}" : "{actor} eliminó a {user} de {file}", "{actor} shared {file} with you" : "{actor} compartió {file} contigo", "{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 8071324848a..d794ec806df 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} eliminó el recurso compartido", "You shared {file} with {user}" : "Ha compartido {file} con {user}", "You removed {user} from {file}" : "Ha eliminado {user} de {file}", + "{actor} shared {file} with {user}" : "{actor} compartió {file} con {user}", "{actor} removed {user} from {file}" : "{actor} eliminó a {user} de {file}", "{actor} shared {file} with you" : "{actor} compartió {file} contigo", "{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}", diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 02b84a578ff..8f2d9699e17 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} a supprimé le partage", "You shared {file} with {user}" : "Vous avez partagé {file} avec {user}", "You removed {user} from {file}" : "Vous avez supprimé {user} de {file}", + "{actor} shared {file} with {user}" : "{actor} a partagé {file} avec {user}", "{actor} removed {user} from {file}" : "{actor} a supprimé {user} de {file}", "{actor} shared {file} with you" : "{actor} a partagé {file} avec vous", "{actor} removed you from {file}" : "{actor} vous a supprimé de {file}", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 0a964b80a30..4a12f746f95 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} a supprimé le partage", "You shared {file} with {user}" : "Vous avez partagé {file} avec {user}", "You removed {user} from {file}" : "Vous avez supprimé {user} de {file}", + "{actor} shared {file} with {user}" : "{actor} a partagé {file} avec {user}", "{actor} removed {user} from {file}" : "{actor} a supprimé {user} de {file}", "{actor} shared {file} with you" : "{actor} a partagé {file} avec vous", "{actor} removed you from {file}" : "{actor} vous a supprimé de {file}", diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index d0e5a00b4cc..39721fd93ee 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} fjarlægði deilingu", "You shared {file} with {user}" : "Þú deildir {file} með {user}", "You removed {user} from {file}" : "Þú fjarlægðir {user} af {file}", + "{actor} shared {file} with {user}" : "{actor} deildi {file} með {user}", "{actor} removed {user} from {file}" : "{actor} fjarlægði {user} af {file}", "{actor} shared {file} with you" : "{actor} deildi {file} með þér", "{actor} removed you from {file}" : "{actor} fjarlægði þig af {file}", @@ -78,6 +79,8 @@ OC.L10N.register( "Public upload is only possible for publicly shared folders" : "Opinber innsending er einungis möguleg í möppur sem er deilt opinberlega", "Invalid date, date format must be YYYY-MM-DD" : "Ógild dagsetning, dagsetningasniðið verður að vera ÁÁÁÁ-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Deiling %s mistókst, því bakvinnslukerfið leyfir ekki sameignir af gerðinni %s", + "You cannot share to a Circle if the app is not enabled" : "Þú getur ekki deilt með hring ef forritið er ekki virkt", + "Please specify a valid circle" : "Settu inn gildan hring", "Unknown share type" : "Óþekkt tegund sameignar", "Not a directory" : "Er ekki mappa", "Could not lock path" : "Gat ekki læst slóð", diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 8f2e238b46d..a6fac5df562 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} fjarlægði deilingu", "You shared {file} with {user}" : "Þú deildir {file} með {user}", "You removed {user} from {file}" : "Þú fjarlægðir {user} af {file}", + "{actor} shared {file} with {user}" : "{actor} deildi {file} með {user}", "{actor} removed {user} from {file}" : "{actor} fjarlægði {user} af {file}", "{actor} shared {file} with you" : "{actor} deildi {file} með þér", "{actor} removed you from {file}" : "{actor} fjarlægði þig af {file}", @@ -76,6 +77,8 @@ "Public upload is only possible for publicly shared folders" : "Opinber innsending er einungis möguleg í möppur sem er deilt opinberlega", "Invalid date, date format must be YYYY-MM-DD" : "Ógild dagsetning, dagsetningasniðið verður að vera ÁÁÁÁ-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Deiling %s mistókst, því bakvinnslukerfið leyfir ekki sameignir af gerðinni %s", + "You cannot share to a Circle if the app is not enabled" : "Þú getur ekki deilt með hring ef forritið er ekki virkt", + "Please specify a valid circle" : "Settu inn gildan hring", "Unknown share type" : "Óþekkt tegund sameignar", "Not a directory" : "Er ekki mappa", "Could not lock path" : "Gat ekki læst slóð", diff --git a/apps/files_sharing/l10n/nb.js b/apps/files_sharing/l10n/nb.js index 54c8dbc5b0f..6cbd38db9a6 100644 --- a/apps/files_sharing/l10n/nb.js +++ b/apps/files_sharing/l10n/nb.js @@ -36,10 +36,13 @@ OC.L10N.register( "Public link expired" : "Offentlig lenke er utløpt", "{actor} shared as public link" : "{actor} delte som offentlig lenke", "{actor} removed public link" : "{actor} fjernet offentlig lenke", + "Public link of {actor} expired" : "Offentlig lenke av {actor} er utløpt", "You shared {file} as public link" : "Du delte {file} som offentlig lenke", "You removed public link for {file}" : "Du fjernet offentlig lenke for {file}", + "Public link expired for {file}" : "Offentlig lenke er utløprt for {file}", "{actor} shared {file} as public link" : "{actor} delte {file} som offentlig lenke", "{actor} removed public link for {file}" : "{actor} fjernet offentlig lenke for {file}", + "Public link of {actor} for {file} expired" : "Offentlig lenke av {actor} for {file} har utløpt", "{user} accepted the remote share" : "{user} godtok fjerndelingen", "{user} declined the remote share" : "{user} avslo fjerndelingen", "You received a new remote share {file} from {user}" : "Du har mottatt en ny fjerndeling {file} fra {user}", @@ -54,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} fjernet deling", "You shared {file} with {user}" : "Du delte {file} med {user}", "You removed {user} from {file}" : "Du fjernet {user} fra {file}", + "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}", "{actor} shared {file} with you" : "{actor} delte {file} med deg", "{actor} removed you from {file}" : "{actor} fjernet deg fra {file}", @@ -75,6 +79,8 @@ OC.L10N.register( "Public upload is only possible for publicly shared folders" : "Offentlig opplasting er kun mulig i offentlig delte mapper", "Invalid date, date format must be YYYY-MM-DD" : "Feil dato, dato må være i formatet YYYY-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Deling av %s feilet på grunn av at tjeneren ikke tillater deling av filtypen %s", + "You cannot share to a Circle if the app is not enabled" : "Du kan ikke dele til en sirkel så lenge appn ikke er aktivert", + "Please specify a valid circle" : "Vennligst angi en gyldig sirkel", "Unknown share type" : "Ukjent ressurstype", "Not a directory" : "Ikke en mappe", "Could not lock path" : "Kunne ikke låse sti", diff --git a/apps/files_sharing/l10n/nb.json b/apps/files_sharing/l10n/nb.json index 2aec2b9b48e..42d6763dcde 100644 --- a/apps/files_sharing/l10n/nb.json +++ b/apps/files_sharing/l10n/nb.json @@ -34,10 +34,13 @@ "Public link expired" : "Offentlig lenke er utløpt", "{actor} shared as public link" : "{actor} delte som offentlig lenke", "{actor} removed public link" : "{actor} fjernet offentlig lenke", + "Public link of {actor} expired" : "Offentlig lenke av {actor} er utløpt", "You shared {file} as public link" : "Du delte {file} som offentlig lenke", "You removed public link for {file}" : "Du fjernet offentlig lenke for {file}", + "Public link expired for {file}" : "Offentlig lenke er utløprt for {file}", "{actor} shared {file} as public link" : "{actor} delte {file} som offentlig lenke", "{actor} removed public link for {file}" : "{actor} fjernet offentlig lenke for {file}", + "Public link of {actor} for {file} expired" : "Offentlig lenke av {actor} for {file} har utløpt", "{user} accepted the remote share" : "{user} godtok fjerndelingen", "{user} declined the remote share" : "{user} avslo fjerndelingen", "You received a new remote share {file} from {user}" : "Du har mottatt en ny fjerndeling {file} fra {user}", @@ -52,6 +55,7 @@ "{actor} removed share" : "{actor} fjernet deling", "You shared {file} with {user}" : "Du delte {file} med {user}", "You removed {user} from {file}" : "Du fjernet {user} fra {file}", + "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}", "{actor} shared {file} with you" : "{actor} delte {file} med deg", "{actor} removed you from {file}" : "{actor} fjernet deg fra {file}", @@ -73,6 +77,8 @@ "Public upload is only possible for publicly shared folders" : "Offentlig opplasting er kun mulig i offentlig delte mapper", "Invalid date, date format must be YYYY-MM-DD" : "Feil dato, dato må være i formatet YYYY-MM-DD", "Sharing %s failed because the back end does not allow shares from type %s" : "Deling av %s feilet på grunn av at tjeneren ikke tillater deling av filtypen %s", + "You cannot share to a Circle if the app is not enabled" : "Du kan ikke dele til en sirkel så lenge appn ikke er aktivert", + "Please specify a valid circle" : "Vennligst angi en gyldig sirkel", "Unknown share type" : "Ukjent ressurstype", "Not a directory" : "Ikke en mappe", "Could not lock path" : "Kunne ikke låse sti", diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index c3f84b11f94..699deb6d01e 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} usunął udostępnienie", "You shared {file} with {user}" : "Współdzielisz {file} z {user}", "You removed {user} from {file}" : "Usunąłeś użytkownika {user} z {file}", + "{actor} shared {file} with {user}" : "{actor} współdzieli {file} z {user}", "{actor} removed {user} from {file}" : "{actor} usunął użytkownika {user} z {file}", "{actor} shared {file} with you" : "{actor} udostępnił ci {file}", "{actor} removed you from {file}" : "{actor} usunął cie z {file}", diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index acb9c4e8e93..d7c0461e8e2 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} usunął udostępnienie", "You shared {file} with {user}" : "Współdzielisz {file} z {user}", "You removed {user} from {file}" : "Usunąłeś użytkownika {user} z {file}", + "{actor} shared {file} with {user}" : "{actor} współdzieli {file} z {user}", "{actor} removed {user} from {file}" : "{actor} usunął użytkownika {user} z {file}", "{actor} shared {file} with you" : "{actor} udostępnił ci {file}", "{actor} removed you from {file}" : "{actor} usunął cie z {file}", diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 5a500150d8c..43fed6a4e81 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} закрыл общий доступ", "You shared {file} with {user}" : "Вы поделились {file} с {user}", "You removed {user} from {file}" : "Вы удалили {user} из {file}", + "{actor} shared {file} with {user}" : "{actor} поделился {file} с {user}", "{actor} removed {user} from {file}" : "{actor} удалил {user} из {file}", "{actor} shared {file} with you" : "{actor} поделился {file} с вами", "{actor} removed you from {file}" : "{actor} удалил вас из {file}", diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index 6945a50d54d..f1521dfddfb 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} закрыл общий доступ", "You shared {file} with {user}" : "Вы поделились {file} с {user}", "You removed {user} from {file}" : "Вы удалили {user} из {file}", + "{actor} shared {file} with {user}" : "{actor} поделился {file} с {user}", "{actor} removed {user} from {file}" : "{actor} удалил {user} из {file}", "{actor} shared {file} with you" : "{actor} поделился {file} с вами", "{actor} removed you from {file}" : "{actor} удалил вас из {file}", diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 69c0d0fde9e..d35dbbbc032 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} paylaşımı kaldırdı", "You shared {file} with {user}" : "{file} dosyasını {user} kullanıcısıyla paylaştınız", "You removed {user} from {file}" : "{file} dosyasının {user} kullanıcısıyla paylaşımını kaldırdınız", + "{actor} shared {file} with {user}" : "{actor} {file} dosyasını {user} kullanıcısı ile paylaştı", "{actor} removed {user} from {file}" : "{actor} {file} dosyasının {user} kullanıcısıyla paylaşımını kaldırdı", "{actor} shared {file} with you" : "{actor} {file} dosyasını sizinle paylaştı", "{actor} removed you from {file}" : "{actor} {file} dosyasının sizinle paylaşımını kaldırdı", diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 228e127b94d..5e55943c9be 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} paylaşımı kaldırdı", "You shared {file} with {user}" : "{file} dosyasını {user} kullanıcısıyla paylaştınız", "You removed {user} from {file}" : "{file} dosyasının {user} kullanıcısıyla paylaşımını kaldırdınız", + "{actor} shared {file} with {user}" : "{actor} {file} dosyasını {user} kullanıcısı ile paylaştı", "{actor} removed {user} from {file}" : "{actor} {file} dosyasının {user} kullanıcısıyla paylaşımını kaldırdı", "{actor} shared {file} with you" : "{actor} {file} dosyasını sizinle paylaştı", "{actor} removed you from {file}" : "{actor} {file} dosyasının sizinle paylaşımını kaldırdı", diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index c56ee3fb36d..49d09aaa66a 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -57,6 +57,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} 移除共享", "You shared {file} with {user}" : "您与 {user} 分享了 {file} ", "You removed {user} from {file}" : "您从 {file} 移除了 {user} ", + "{actor} shared {file} with {user}" : "{actor} 共享 {file} 与 {user}", "{actor} removed {user} from {file}" : "{actor} 移除 {user} 从 {file}", "{actor} shared {file} with you" : "{actor} 与您共享了 {file} ", "{actor} removed you from {file}" : "{actor} 将您从 {file} 移除", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index 8d6ff8115f3..e6c56ac9938 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -55,6 +55,7 @@ "{actor} removed share" : "{actor} 移除共享", "You shared {file} with {user}" : "您与 {user} 分享了 {file} ", "You removed {user} from {file}" : "您从 {file} 移除了 {user} ", + "{actor} shared {file} with {user}" : "{actor} 共享 {file} 与 {user}", "{actor} removed {user} from {file}" : "{actor} 移除 {user} 从 {file}", "{actor} shared {file} with you" : "{actor} 与您共享了 {file} ", "{actor} removed you from {file}" : "{actor} 将您从 {file} 移除", diff --git a/apps/systemtags/l10n/zh_CN.js b/apps/systemtags/l10n/zh_CN.js index 08e33655812..7f1d197bf32 100644 --- a/apps/systemtags/l10n/zh_CN.js +++ b/apps/systemtags/l10n/zh_CN.js @@ -31,9 +31,17 @@ OC.L10N.register( "%1$s updated system tag %3$s to %2$s" : "%1$s 更新了系统标签 %3$s 为 %2$s", "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor}更新系统标签{oldsystemtag}到{newsystemtag}", "You added system tag %2$s to %1$s" : "你填加系统标签%2$s到%1$s", + "You added system tag {systemtag} to {file}" : "你添加了系统标记 {systemtag} 到 {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s 添加系统标记 %3$s 到 %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} 添加系统标记 {systemtag} 到 {file}", + "You removed system tag %2$s from %1$s" : "你移除的系统标记 %2$s 于 %1$s", + "You removed system tag {systemtag} from {file}" : "你移除了系统标记 {systemtag} 从 {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s 移除了系统标记 %3$s 从 %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} 移除了系统标记 {systemtag} 从 {file}", "%s (restricted)" : "%s (受限)", "%s (invisible)" : "%s (不可见)", "<strong>System tags</strong> for a file have been modified" : "已更改的文件的<strong>系统标签</strong> ", + "Collaborative tags" : "协同标记", "Name" : "名称", "Delete" : "删除", "Public" : "公开", @@ -44,11 +52,16 @@ OC.L10N.register( "No entries found in this folder" : "此文件夹中无项目", "Size" : "大小", "Modified" : "修改日期", + "You assigned system tag %3$s" : "你指定的系统标记 %3$s", "%1$s assigned system tag %3$s" : "%1$s 分配了系统标签 %3$s", "You unassigned system tag %3$s" : "未赋值系统标签 %3$s", "%1$s unassigned system tag %3$s" : "%1$s 取消分配了系统标签 %3$s", + "You created system tag %2$s" : "你创建了系统标记 %2$s", "You deleted system tag %2$s" : "删除了系统标识 %2$s", + "You updated system tag %3$s to %2$s" : "你更新了系统标记 %3$s 到 %2$s", + "You assigned system tag %3$s to %2$s" : "你指定了系统标记 %3$s 到 %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s 分配了系统标签 %3$s 到 %2$s", + "You unassigned system tag %3$s from %2$s" : "你未指定系统标记 %3$s 于 %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s 取消分配系统标签 %3$s 从 %2$s" }, "nplurals=1; plural=0;"); diff --git a/apps/systemtags/l10n/zh_CN.json b/apps/systemtags/l10n/zh_CN.json index 55bb4f9b2cf..2bea499ff6a 100644 --- a/apps/systemtags/l10n/zh_CN.json +++ b/apps/systemtags/l10n/zh_CN.json @@ -29,9 +29,17 @@ "%1$s updated system tag %3$s to %2$s" : "%1$s 更新了系统标签 %3$s 为 %2$s", "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor}更新系统标签{oldsystemtag}到{newsystemtag}", "You added system tag %2$s to %1$s" : "你填加系统标签%2$s到%1$s", + "You added system tag {systemtag} to {file}" : "你添加了系统标记 {systemtag} 到 {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s 添加系统标记 %3$s 到 %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} 添加系统标记 {systemtag} 到 {file}", + "You removed system tag %2$s from %1$s" : "你移除的系统标记 %2$s 于 %1$s", + "You removed system tag {systemtag} from {file}" : "你移除了系统标记 {systemtag} 从 {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s 移除了系统标记 %3$s 从 %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} 移除了系统标记 {systemtag} 从 {file}", "%s (restricted)" : "%s (受限)", "%s (invisible)" : "%s (不可见)", "<strong>System tags</strong> for a file have been modified" : "已更改的文件的<strong>系统标签</strong> ", + "Collaborative tags" : "协同标记", "Name" : "名称", "Delete" : "删除", "Public" : "公开", @@ -42,11 +50,16 @@ "No entries found in this folder" : "此文件夹中无项目", "Size" : "大小", "Modified" : "修改日期", + "You assigned system tag %3$s" : "你指定的系统标记 %3$s", "%1$s assigned system tag %3$s" : "%1$s 分配了系统标签 %3$s", "You unassigned system tag %3$s" : "未赋值系统标签 %3$s", "%1$s unassigned system tag %3$s" : "%1$s 取消分配了系统标签 %3$s", + "You created system tag %2$s" : "你创建了系统标记 %2$s", "You deleted system tag %2$s" : "删除了系统标识 %2$s", + "You updated system tag %3$s to %2$s" : "你更新了系统标记 %3$s 到 %2$s", + "You assigned system tag %3$s to %2$s" : "你指定了系统标记 %3$s 到 %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s 分配了系统标签 %3$s 到 %2$s", + "You unassigned system tag %3$s from %2$s" : "你未指定系统标记 %3$s 于 %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s 取消分配系统标签 %3$s 从 %2$s" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/twofactor_backupcodes/l10n/de_DE.js b/apps/twofactor_backupcodes/l10n/de_DE.js index 5fad4c9d00a..0764ef3b7a4 100644 --- a/apps/twofactor_backupcodes/l10n/de_DE.js +++ b/apps/twofactor_backupcodes/l10n/de_DE.js @@ -1,13 +1,13 @@ OC.L10N.register( "twofactor_backupcodes", { - "Generate backup codes" : "Backup-Codes erstellen", + "Generate backup codes" : "Backup-Codes erzeugen", "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Backup-Codes wurden erstellt. {{used}} von {{total}} Codes wurden verwandt.", "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Dies sind Ihre Backup-Codes. Bitte speichern und/oder drucken Sie diese, da diese Codes später nicht mehr gelesen werden können", "Save backup codes" : "Backup-Codes speichern", "Print backup codes" : "Backup-Codes drucken", "Regenerate backup codes" : "Backup-Codes erneuern", - "If you regenerate backup codes, you automatically invalidate old codes." : "Wenn Sie die Backup-Codes erneuern werde die alten Codes automatisch ungültig.", + "If you regenerate backup codes, you automatically invalidate old codes." : "Wenn Sie die Backup-Codes erneuern, werden die alten Codes automatisch ungültig.", "An error occurred while generating your backup codes" : "Beim Erstellen Ihrer Backup-Codes ist ein Fehler aufgetreten", "Nextcloud backup codes" : "Nextcloud Backup-Codes", "Two-factor authentication" : "Zwei-Faktor Authentifizierung", diff --git a/apps/twofactor_backupcodes/l10n/de_DE.json b/apps/twofactor_backupcodes/l10n/de_DE.json index a30433935d3..43f36e49cb3 100644 --- a/apps/twofactor_backupcodes/l10n/de_DE.json +++ b/apps/twofactor_backupcodes/l10n/de_DE.json @@ -1,11 +1,11 @@ { "translations": { - "Generate backup codes" : "Backup-Codes erstellen", + "Generate backup codes" : "Backup-Codes erzeugen", "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Backup-Codes wurden erstellt. {{used}} von {{total}} Codes wurden verwandt.", "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Dies sind Ihre Backup-Codes. Bitte speichern und/oder drucken Sie diese, da diese Codes später nicht mehr gelesen werden können", "Save backup codes" : "Backup-Codes speichern", "Print backup codes" : "Backup-Codes drucken", "Regenerate backup codes" : "Backup-Codes erneuern", - "If you regenerate backup codes, you automatically invalidate old codes." : "Wenn Sie die Backup-Codes erneuern werde die alten Codes automatisch ungültig.", + "If you regenerate backup codes, you automatically invalidate old codes." : "Wenn Sie die Backup-Codes erneuern, werden die alten Codes automatisch ungültig.", "An error occurred while generating your backup codes" : "Beim Erstellen Ihrer Backup-Codes ist ein Fehler aufgetreten", "Nextcloud backup codes" : "Nextcloud Backup-Codes", "Two-factor authentication" : "Zwei-Faktor Authentifizierung", diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index 462dc58a3f0..1c96aca2175 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -21,11 +21,11 @@ OC.L10N.register( "Select object classes" : "Nesne sınıflarını seçin", "Please check the credentials, they seem to be wrong." : "Lütfen kimlik doğrulama bilgilerini denetleyin, hatalı görünüyor.", "Please specify the port, it could not be auto-detected." : "Lütfen kapı numarasını belirtin. Otomatik olarak algılanamadı.", - "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN otomatik olarak tespit edilemedi, lütfen kimlik bilgilerini, sunucuyu ve bağlantı noktasını gözden geçirin.", - "Could not detect Base DN, please enter it manually." : "Base DN tespit edilemedi, lütfen elle girin.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN otomatik olarak algılanamadı. Lütfen kimlik doğrulama bilgilerini, sunucu ve kapı numarasını gözden geçirin.", + "Could not detect Base DN, please enter it manually." : "Base DN algılanamadı. Lütfen el ile yazın.", "{nthServer}. Server" : "{nthServer}. Sunucu", - "No object found in the given Base DN. Please revise." : "Girilen Base DN içerisinde nesne bulunamadı. Lütfen gözden geçirin.", - "More than 1,000 directory entries available." : "1000'den fazla dizin şu an müsait durumdadır.", + "No object found in the given Base DN. Please revise." : "Belirtilen Base DN içerisinde herhangi bir nesne bulunamadı. Lütfen gözden geçirin.", + "More than 1,000 directory entries available." : "Kullanılabilecek 1000'den fazla dizin kaydı var.", " entries available within the provided Base DN" : " girdi sağlanan Base DN içerisinde mevcut", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Bir hata oluştu. Lütfen Base DN ile birlikte bağlantı ayarlarını ve kimlik bilgilerini denetleyin.", "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?", diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index 3db36190ed8..2be5857938a 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -19,11 +19,11 @@ "Select object classes" : "Nesne sınıflarını seçin", "Please check the credentials, they seem to be wrong." : "Lütfen kimlik doğrulama bilgilerini denetleyin, hatalı görünüyor.", "Please specify the port, it could not be auto-detected." : "Lütfen kapı numarasını belirtin. Otomatik olarak algılanamadı.", - "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN otomatik olarak tespit edilemedi, lütfen kimlik bilgilerini, sunucuyu ve bağlantı noktasını gözden geçirin.", - "Could not detect Base DN, please enter it manually." : "Base DN tespit edilemedi, lütfen elle girin.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN otomatik olarak algılanamadı. Lütfen kimlik doğrulama bilgilerini, sunucu ve kapı numarasını gözden geçirin.", + "Could not detect Base DN, please enter it manually." : "Base DN algılanamadı. Lütfen el ile yazın.", "{nthServer}. Server" : "{nthServer}. Sunucu", - "No object found in the given Base DN. Please revise." : "Girilen Base DN içerisinde nesne bulunamadı. Lütfen gözden geçirin.", - "More than 1,000 directory entries available." : "1000'den fazla dizin şu an müsait durumdadır.", + "No object found in the given Base DN. Please revise." : "Belirtilen Base DN içerisinde herhangi bir nesne bulunamadı. Lütfen gözden geçirin.", + "More than 1,000 directory entries available." : "Kullanılabilecek 1000'den fazla dizin kaydı var.", " entries available within the provided Base DN" : " girdi sağlanan Base DN içerisinde mevcut", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Bir hata oluştu. Lütfen Base DN ile birlikte bağlantı ayarlarını ve kimlik bilgilerini denetleyin.", "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?", diff --git a/apps/workflowengine/l10n/de_DE.js b/apps/workflowengine/l10n/de_DE.js index 55e23518b64..e5c0d65a45f 100644 --- a/apps/workflowengine/l10n/de_DE.js +++ b/apps/workflowengine/l10n/de_DE.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Successfully saved" : "Erfolgreich gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", - "File mime type" : "Datei Mime-Typ", + "File mime type" : "Datei MIME-Typ", "is" : "ist", "is not" : "ist nicht", "matches" : "passt zu", diff --git a/apps/workflowengine/l10n/de_DE.json b/apps/workflowengine/l10n/de_DE.json index 4e44958cf39..6c4b954f282 100644 --- a/apps/workflowengine/l10n/de_DE.json +++ b/apps/workflowengine/l10n/de_DE.json @@ -1,7 +1,7 @@ { "translations": { "Successfully saved" : "Erfolgreich gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", - "File mime type" : "Datei Mime-Typ", + "File mime type" : "Datei MIME-Typ", "is" : "ist", "is not" : "ist nicht", "matches" : "passt zu", diff --git a/apps/workflowengine/l10n/sk.js b/apps/workflowengine/l10n/sk.js index b524bd9d956..795f6e96783 100644 --- a/apps/workflowengine/l10n/sk.js +++ b/apps/workflowengine/l10n/sk.js @@ -8,6 +8,7 @@ OC.L10N.register( "is not" : "nie je", "matches" : "súhlasí", "does not match" : "nesúhlasí", + "Example: {placeholder}" : "Napríklad: {placeholder}", "File size (upload)" : "Veľkosť súboru (upload)", "less" : "menej", "less or equals" : "menej alebo rovné", diff --git a/apps/workflowengine/l10n/sk.json b/apps/workflowengine/l10n/sk.json index 4cad6608288..8840484f806 100644 --- a/apps/workflowengine/l10n/sk.json +++ b/apps/workflowengine/l10n/sk.json @@ -6,6 +6,7 @@ "is not" : "nie je", "matches" : "súhlasí", "does not match" : "nesúhlasí", + "Example: {placeholder}" : "Napríklad: {placeholder}", "File size (upload)" : "Veľkosť súboru (upload)", "less" : "menej", "less or equals" : "menej alebo rovné", diff --git a/bower.json b/bower.json index 0735f4eb5a0..6a64e184b07 100644 --- a/bower.json +++ b/bower.json @@ -29,7 +29,7 @@ "underscore": "~1.8.0", "bootstrap": "~3.3.6", "backbone": "~1.2.3", - "davclient.js": "https://github.com/evert/davclient.js.git", + "davclient.js": "https://github.com/evert/davclient.js.git#0.1.1", "es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0", "base64": "~0.3.0", "clipboard": "^1.5.12", diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature index 7fbdf828fb8..da085d9e983 100644 --- a/build/integration/features/external-storage.feature +++ b/build/integration/features/external-storage.feature @@ -23,4 +23,20 @@ Feature: external-storage | token | A_TOKEN | | mimetype | httpd/unix-directory | - + @local_storage + Scenario: Shares dont overwrite external storages + Given user "user0" exists + And user "user1" exists + And As an "user0" + And User "user0" moved file "/textfile0.txt" to "/local_storage/textfile0.txt" + And invoking occ with "files_external:create --user user0 test local null::null -c datadir=./build/integration/work/local_storage" + And invoking occ with "files:scan --path /user0/files/test" + And as "user0" the file "/local_storage/textfile0.txt" exists + And as "user0" the folder "/test" exists + And as "user0" the file "/test/textfile0.txt" exists + And As an "user1" + And user "user1" created a folder "/test" + And User "user1" moved file "/textfile0.txt" to "/test/textfile1.txt" + And folder "/test" of user "user1" is shared with user "user0" + And As an "user0" + Then as "user0" the file "/test/textfile1.txt" does not exist diff --git a/build/integration/run.sh b/build/integration/run.sh index 83600d8323e..f423c3e6fb7 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -46,7 +46,7 @@ if [ "$INSTALLED" == "true" ]; then mkdir -p work/local_storage OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` - ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}` + ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | tr ' ' '\n' | tail -n1` $OCC files_external:option $ID_STORAGE enable_sharing true diff --git a/core/l10n/cs.js b/core/l10n/cs.js index adf648becc4..c4322b73b17 100644 --- a/core/l10n/cs.js +++ b/core/l10n/cs.js @@ -97,6 +97,7 @@ OC.L10N.register( "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Je nakonfigurován memcached jako distribuovaná cache, ale je nainstalovaný nesprávný PHP modul \"memcache\". \\OC\\Memcache\\Memcached podporuje pouze \"memcached\" a ne \"memcache\". Podívejte se na <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki o obou modulech</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Některé soubory neprošly kontrolou integrity. Více informací o tom jak tento problém vyřešit, lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neplatných souborů…</a> / <a href=\"{rescanEndpoint}\">Znovu ověřit…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache není správně nakonfigurována. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Pro lepší výkon doporučujeme ↗</a> použít následující nastavení v <code>php.ini</code>:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP funkce \"set_time_limit\" není dostupná. To může způsobit ukončení skriptů uprostřed provádění a další problémy s instalací. Doporučujeme tuto funkc povolit.", "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.", @@ -119,6 +120,7 @@ OC.L10N.register( "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.", "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.", "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno", + "Share to {name}" : "Sdílet {name}", "Share link" : "Sdílet odkaz", "Link" : "Odkaz", "Password protect" : "Chránit heslem", @@ -150,6 +152,7 @@ OC.L10N.register( "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (remote)" : "{sharee} (vzdálený)", "{sharee} (email)" : "{sharee} (email)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Sdílet", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Sdílet s uživateli na jiných serverech za použití jejich sdílených cloud ID username@example.com/nextcloud", "Share with users or by mail..." : "Sdílejte s uživateli, nebo emailem...", @@ -180,6 +183,7 @@ OC.L10N.register( "sunny" : "slunečno", "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}", "Hello {name}" : "Vítej, {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Toto jsou vaše výsledky hledání<script>alert(1)</script></strong>", "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The update is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", @@ -190,6 +194,7 @@ OC.L10N.register( "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Aktualizace byla neúspěšná. Nahlaste prosím problém <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitě Nextcloudu</a>", "Continue to Nextcloud" : "Pokračovat do Nextcloud", "Searching other places" : "Prohledávání ostatních umístění", + "No search results in other folders for {tag}{filter}{endtag}" : "Žádné výsledky v dalších složkách pro {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} nález v dalším adresáři","{count} nálezy v dalších adresářích","{count} nálezů v dalších adresářích"], "Personal" : "Osobní", "Users" : "Uživatelé", diff --git a/core/l10n/cs.json b/core/l10n/cs.json index 53cd98dee6c..e18604b31c9 100644 --- a/core/l10n/cs.json +++ b/core/l10n/cs.json @@ -95,6 +95,7 @@ "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Je nakonfigurován memcached jako distribuovaná cache, ale je nainstalovaný nesprávný PHP modul \"memcache\". \\OC\\Memcache\\Memcached podporuje pouze \"memcached\" a ne \"memcache\". Podívejte se na <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki o obou modulech</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Některé soubory neprošly kontrolou integrity. Více informací o tom jak tento problém vyřešit, lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neplatných souborů…</a> / <a href=\"{rescanEndpoint}\">Znovu ověřit…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache není správně nakonfigurována. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Pro lepší výkon doporučujeme ↗</a> použít následující nastavení v <code>php.ini</code>:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP funkce \"set_time_limit\" není dostupná. To může způsobit ukončení skriptů uprostřed provádění a další problémy s instalací. Doporučujeme tuto funkc povolit.", "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.", @@ -117,6 +118,7 @@ "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.", "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.", "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno", + "Share to {name}" : "Sdílet {name}", "Share link" : "Sdílet odkaz", "Link" : "Odkaz", "Password protect" : "Chránit heslem", @@ -148,6 +150,7 @@ "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (remote)" : "{sharee} (vzdálený)", "{sharee} (email)" : "{sharee} (email)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Sdílet", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Sdílet s uživateli na jiných serverech za použití jejich sdílených cloud ID username@example.com/nextcloud", "Share with users or by mail..." : "Sdílejte s uživateli, nebo emailem...", @@ -178,6 +181,7 @@ "sunny" : "slunečno", "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}", "Hello {name}" : "Vítej, {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Toto jsou vaše výsledky hledání<script>alert(1)</script></strong>", "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The update is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", @@ -188,6 +192,7 @@ "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Aktualizace byla neúspěšná. Nahlaste prosím problém <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitě Nextcloudu</a>", "Continue to Nextcloud" : "Pokračovat do Nextcloud", "Searching other places" : "Prohledávání ostatních umístění", + "No search results in other folders for {tag}{filter}{endtag}" : "Žádné výsledky v dalších složkách pro {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} nález v dalším adresáři","{count} nálezy v dalších adresářích","{count} nálezů v dalších adresářích"], "Personal" : "Osobní", "Users" : "Uživatelé", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 1a6bf9d802f..e20b7525ab3 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -48,7 +48,7 @@ OC.L10N.register( "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>", "Settings" : "Einstellungen", "Connection to server lost" : "Verbindung zum Server verloren", - "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in 5 Sekunden erneut geladen"], + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite. Seite wird in %n Sekunden erneut geladen"], "Saving..." : "Speichere...", "Dismiss" : "Ausblenden", "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von Ihnen", @@ -186,7 +186,7 @@ OC.L10N.register( "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Dies sind Ihre Suchergebnisse<script>alert(1)</script></strong>", "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], - "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie dieses Fenster verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.", + "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt. Das Verlassen dieses Fenster, kann den Aktualisierungsprozess in manchen Umgebungen unterbrechen.", "Update to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte die Seite neu laden.", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 98542ed9a09..a78eb90c3c7 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -46,7 +46,7 @@ "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>", "Settings" : "Einstellungen", "Connection to server lost" : "Verbindung zum Server verloren", - "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in 5 Sekunden erneut geladen"], + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite. Seite wird in %n Sekunden erneut geladen"], "Saving..." : "Speichere...", "Dismiss" : "Ausblenden", "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von Ihnen", @@ -184,7 +184,7 @@ "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Dies sind Ihre Suchergebnisse<script>alert(1)</script></strong>", "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], - "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie dieses Fenster verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.", + "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt. Das Verlassen dieses Fenster, kann den Aktualisierungsprozess in manchen Umgebungen unterbrechen.", "Update to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte die Seite neu laden.", diff --git a/core/l10n/es.js b/core/l10n/es.js index 816b67bc008..bd5297b33ce 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -193,7 +193,9 @@ OC.L10N.register( "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La actualización tuvo un problema. Para más información <a href=\"{url}\">consulta nuestro artículo del foro</a> para arreglar este problema.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "La actualización falló. Por favor, informa de este problema en la <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunidad de Nextcloud</a>.", "Continue to Nextcloud" : "Continuar a Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["La actualización fue exitosa. Redireccionandolo a Nextcloud en %n segundo.","La actualización fue exitosa. Redireccionandolo a Nextcloud en %n segundos."], "Searching other places" : "Buscando en otros lugares", + "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados de búsqueda en otros folders para {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado de búsqueda en otra carpeta","{count} resultados de búsqueda en otras carpetas"], "Personal" : "Personal", "Users" : "Usuarios", @@ -246,6 +248,7 @@ OC.L10N.register( "Need help?" : "¿Necesita ayuda?", "See the documentation" : "Vea la documentación", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.", + "More apps" : "Más aplicaciones", "Search" : "Buscar", "Log out" : "Salir", "This action requires you to confirm your password:" : "Esta acción requiere que confirme su contraseña:", diff --git a/core/l10n/es.json b/core/l10n/es.json index efde12ac945..c4acf2f8744 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -191,7 +191,9 @@ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La actualización tuvo un problema. Para más información <a href=\"{url}\">consulta nuestro artículo del foro</a> para arreglar este problema.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "La actualización falló. Por favor, informa de este problema en la <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunidad de Nextcloud</a>.", "Continue to Nextcloud" : "Continuar a Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["La actualización fue exitosa. Redireccionandolo a Nextcloud en %n segundo.","La actualización fue exitosa. Redireccionandolo a Nextcloud en %n segundos."], "Searching other places" : "Buscando en otros lugares", + "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados de búsqueda en otros folders para {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado de búsqueda en otra carpeta","{count} resultados de búsqueda en otras carpetas"], "Personal" : "Personal", "Users" : "Usuarios", @@ -244,6 +246,7 @@ "Need help?" : "¿Necesita ayuda?", "See the documentation" : "Vea la documentación", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.", + "More apps" : "Más aplicaciones", "Search" : "Buscar", "Log out" : "Salir", "This action requires you to confirm your password:" : "Esta acción requiere que confirme su contraseña:", diff --git a/core/l10n/is.js b/core/l10n/is.js index 1282eab9183..3bec1f122e8 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -97,6 +97,7 @@ OC.L10N.register( "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache er ekki rétt uppsett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Fyrir betri afköst mælum við með ↗</a> því að nota eftirfarandi stillingar í <code>php.ini</code>:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-fallið \"set_time_limit\" er ekki tiltækt. Þetta gæti valdið því að skriftur stöðvist í miðri keyrslu og skemmi uppsetninguna þína. Við mælumst til þess að þetta fall sé gert virkt.", "Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetningu þjóns", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Gagnamappan og skrárnar þínar eru líklega aðgengilegar öllum af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjóninn þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir skjalarót vefþjóns.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP-haus er ekki stilltur til jafns við \"{expected}\". Þetta er möguleg áhætta varðandi öryggi og gagnaleynd, við mælum með því að laga þessa stillingu.", @@ -119,6 +120,7 @@ OC.L10N.register( "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.", "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.", "Resharing is not allowed" : "Endurdeiling er ekki leyfð", + "Share to {name}" : "Deila til {name}", "Share link" : "Deila tengli", "Link" : "Tengill", "Password protect" : "Verja með lykilorði", @@ -150,6 +152,7 @@ OC.L10N.register( "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (remote)" : "{sharee} (fjartengdur)", "{sharee} (email)" : "{sharee} (tölvupóstur)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Deila", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Deila með fólki í öðrum gagnaskýjum með auðkenninu notandanafn@dæmi.is/nextcloud", "Share with users or by mail..." : "Deila með notendum eða með tölvupósti...", @@ -180,6 +183,7 @@ OC.L10N.register( "sunny" : "sólríkt", "Hello {name}, the weather is {weather}" : "Halló {name},veðrið er {weather}", "Hello {name}" : "Halló {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Hér eru leitarniðurstöðurnar þínar<script>alert(1)</script></strong>", "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", @@ -189,7 +193,9 @@ OC.L10N.register( "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud samfélagsins</a>.", "Continue to Nextcloud" : "Halda áfram í Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Uppfærslan heppnaðist. Beini þér til Nextcloud eftir %n sekúndu.","Uppfærslan heppnaðist. Beini þér til Nextcloud eftir %n sekúndur."], "Searching other places" : "Leitað á öðrum stöðum", + "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} leitarniðurstöður í annarri möppu","{count} leitarniðurstöður í öðrum möppum"], "Personal" : "Einka", "Users" : "Notendur", @@ -242,6 +248,7 @@ OC.L10N.register( "Need help?" : "Þarftu hjálp?", "See the documentation" : "Sjá hjálparskjölin", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. {linkstart} virkjaðu JavaScript {linkend} og endurlestu síðan síðuna.", + "More apps" : "Fleiri forrit", "Search" : "Leita", "Log out" : "Skrá út", "This action requires you to confirm your password:" : "Þessi aðgerð krefst þess að þú staðfestir lykilorðið þitt:", diff --git a/core/l10n/is.json b/core/l10n/is.json index 58ddb977020..70482c893b5 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -95,6 +95,7 @@ "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache er ekki rétt uppsett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Fyrir betri afköst mælum við með ↗</a> því að nota eftirfarandi stillingar í <code>php.ini</code>:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-fallið \"set_time_limit\" er ekki tiltækt. Þetta gæti valdið því að skriftur stöðvist í miðri keyrslu og skemmi uppsetninguna þína. Við mælumst til þess að þetta fall sé gert virkt.", "Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetningu þjóns", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Gagnamappan og skrárnar þínar eru líklega aðgengilegar öllum af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjóninn þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir skjalarót vefþjóns.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP-haus er ekki stilltur til jafns við \"{expected}\". Þetta er möguleg áhætta varðandi öryggi og gagnaleynd, við mælum með því að laga þessa stillingu.", @@ -117,6 +118,7 @@ "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.", "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.", "Resharing is not allowed" : "Endurdeiling er ekki leyfð", + "Share to {name}" : "Deila til {name}", "Share link" : "Deila tengli", "Link" : "Tengill", "Password protect" : "Verja með lykilorði", @@ -148,6 +150,7 @@ "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (remote)" : "{sharee} (fjartengdur)", "{sharee} (email)" : "{sharee} (tölvupóstur)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Deila", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Deila með fólki í öðrum gagnaskýjum með auðkenninu notandanafn@dæmi.is/nextcloud", "Share with users or by mail..." : "Deila með notendum eða með tölvupósti...", @@ -178,6 +181,7 @@ "sunny" : "sólríkt", "Hello {name}, the weather is {weather}" : "Halló {name},veðrið er {weather}", "Hello {name}" : "Halló {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Hér eru leitarniðurstöðurnar þínar<script>alert(1)</script></strong>", "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", @@ -187,7 +191,9 @@ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud samfélagsins</a>.", "Continue to Nextcloud" : "Halda áfram í Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Uppfærslan heppnaðist. Beini þér til Nextcloud eftir %n sekúndu.","Uppfærslan heppnaðist. Beini þér til Nextcloud eftir %n sekúndur."], "Searching other places" : "Leitað á öðrum stöðum", + "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} leitarniðurstöður í annarri möppu","{count} leitarniðurstöður í öðrum möppum"], "Personal" : "Einka", "Users" : "Notendur", @@ -240,6 +246,7 @@ "Need help?" : "Þarftu hjálp?", "See the documentation" : "Sjá hjálparskjölin", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. {linkstart} virkjaðu JavaScript {linkend} og endurlestu síðan síðuna.", + "More apps" : "Fleiri forrit", "Search" : "Leita", "Log out" : "Skrá út", "This action requires you to confirm your password:" : "Þessi aðgerð krefst þess að þú staðfestir lykilorðið þitt:", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 70d4bb1dabf..2686a52cadf 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -97,6 +97,7 @@ OC.L10N.register( "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されています。しかし、PHPモジュール \"memcache\"が間違ってインストールされています。 \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしています。\"memcache\" ではありません。<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki で両方のモジュールの情報</a> について確認してください。", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "いくつかのファイルでチェックサムが適合しませんでした。この問題を解決するためは、<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>の詳細を見てください。(<a href=\"{codeIntegrityDownloadEndpoint}\">不適合ファイルのリスト…</a> / <a href=\"{rescanEndpoint}\">再チェック…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache が正しく設定されていません。 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">パフォーマンスを向上させるため ↗</a> <code>php.ini</code> で次の設定を使用することをお勧めします:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP 関数 \"set_time_limit\" は使用できません。これにより実行スクリプトが途中で停止されて、インストールを破壊する可能性があります。この機能を有効にすることを強くお勧めします。", "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。", @@ -119,6 +120,7 @@ OC.L10N.register( "Press ⌘-C to copy." : "⌘+Cを押してコピーします。", "Press Ctrl-C to copy." : "Ctrl+Cを押してコピーします。", "Resharing is not allowed" : "再共有は許可されていません", + "Share to {name}" : "{name} に共有する", "Share link" : "URLで共有", "Link" : "リンク", "Password protect" : "パスワード保護を有効化", @@ -150,6 +152,7 @@ OC.L10N.register( "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (remote)" : "{sharee} (リモート)", "{sharee} (email)" : "{sharee} (メール)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "共有", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Federated Cloud ID（ username@example.com/nextcloud ）を使用して他のサーバーのユーザーと共有する", "Share with users or by mail..." : "ユーザーまたはメールで共有する...", @@ -180,6 +183,7 @@ OC.L10N.register( "sunny" : "快晴", "Hello {name}, the weather is {weather}" : "こんにちは､ {name}､ 天気は{weather}です", "Hello {name}" : " {name}さん､こんにちは", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>これが検索結果です<script>alert(1)</script></strong>", "new" : "新規", "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"], "The update is in progress, leaving this page might interrupt the process in some environments." : "更新が進行中です。このページを離れると一部の環境では処理が中断されてしまう可能性があります。", @@ -189,6 +193,7 @@ OC.L10N.register( "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "アップデートできませんでした。この問題に対する詳細な情報については、<a href=\"{url}\">フォーラムの投稿を確認してください</a> ", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "アップデートできませんでした。<a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud コミュニティ</a> に問題を報告してください。", "Continue to Nextcloud" : "Nextcloud に進む", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["更新が成功しました。 %n 秒後に Nextcloud にリダイレクトします。"], "Searching other places" : "他の場所の検索", "No search results in other folders for {tag}{filter}{endtag}" : "他のフォルダーに {tag}{filter}{endtag} の検索結果はありません", "_{count} search result in another folder_::_{count} search results in other folders_" : ["他のフォルダーの検索件数 {count}"], @@ -243,6 +248,7 @@ OC.L10N.register( "Need help?" : "ヘルプが必要ですか？", "See the documentation" : "ドキュメントを確認してください", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "このアプリケーションの動作にはJavaScriptが必要です。\n {linkstart}JavaScriptを有効にし{linkend} 、ページを更新してください。 ", + "More apps" : "さらにアプリ", "Search" : "検索", "Log out" : "ログアウト", "This action requires you to confirm your password:" : "この操作では、パスワードを確認する必要があります:", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 7ee874718bf..b9028f55df8 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -95,6 +95,7 @@ "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されています。しかし、PHPモジュール \"memcache\"が間違ってインストールされています。 \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしています。\"memcache\" ではありません。<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki で両方のモジュールの情報</a> について確認してください。", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "いくつかのファイルでチェックサムが適合しませんでした。この問題を解決するためは、<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>の詳細を見てください。(<a href=\"{codeIntegrityDownloadEndpoint}\">不適合ファイルのリスト…</a> / <a href=\"{rescanEndpoint}\">再チェック…</a>)", "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache が正しく設定されていません。 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">パフォーマンスを向上させるため ↗</a> <code>php.ini</code> で次の設定を使用することをお勧めします:", + "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP 関数 \"set_time_limit\" は使用できません。これにより実行スクリプトが途中で停止されて、インストールを破壊する可能性があります。この機能を有効にすることを強くお勧めします。", "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。", @@ -117,6 +118,7 @@ "Press ⌘-C to copy." : "⌘+Cを押してコピーします。", "Press Ctrl-C to copy." : "Ctrl+Cを押してコピーします。", "Resharing is not allowed" : "再共有は許可されていません", + "Share to {name}" : "{name} に共有する", "Share link" : "URLで共有", "Link" : "リンク", "Password protect" : "パスワード保護を有効化", @@ -148,6 +150,7 @@ "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (remote)" : "{sharee} (リモート)", "{sharee} (email)" : "{sharee} (メール)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "共有", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Federated Cloud ID（ username@example.com/nextcloud ）を使用して他のサーバーのユーザーと共有する", "Share with users or by mail..." : "ユーザーまたはメールで共有する...", @@ -178,6 +181,7 @@ "sunny" : "快晴", "Hello {name}, the weather is {weather}" : "こんにちは､ {name}､ 天気は{weather}です", "Hello {name}" : " {name}さん､こんにちは", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>これが検索結果です<script>alert(1)</script></strong>", "new" : "新規", "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"], "The update is in progress, leaving this page might interrupt the process in some environments." : "更新が進行中です。このページを離れると一部の環境では処理が中断されてしまう可能性があります。", @@ -187,6 +191,7 @@ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "アップデートできませんでした。この問題に対する詳細な情報については、<a href=\"{url}\">フォーラムの投稿を確認してください</a> ", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "アップデートできませんでした。<a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud コミュニティ</a> に問題を報告してください。", "Continue to Nextcloud" : "Nextcloud に進む", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["更新が成功しました。 %n 秒後に Nextcloud にリダイレクトします。"], "Searching other places" : "他の場所の検索", "No search results in other folders for {tag}{filter}{endtag}" : "他のフォルダーに {tag}{filter}{endtag} の検索結果はありません", "_{count} search result in another folder_::_{count} search results in other folders_" : ["他のフォルダーの検索件数 {count}"], @@ -241,6 +246,7 @@ "Need help?" : "ヘルプが必要ですか？", "See the documentation" : "ドキュメントを確認してください", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "このアプリケーションの動作にはJavaScriptが必要です。\n {linkstart}JavaScriptを有効にし{linkend} 、ページを更新してください。 ", + "More apps" : "さらにアプリ", "Search" : "検索", "Log out" : "ログアウト", "This action requires you to confirm your password:" : "この操作では、パスワードを確認する必要があります:", diff --git a/core/l10n/nb.js b/core/l10n/nb.js index 782eeaf748b..fdde4bbcd24 100644 --- a/core/l10n/nb.js +++ b/core/l10n/nb.js @@ -48,6 +48,7 @@ OC.L10N.register( "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>", "Settings" : "Innstillinger", "Connection to server lost" : "Mistet tilkobling til tjener", + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem ved lasting av side, laster på nytt om %n sekund","Problem ved lasting av side, laster på nytt om %n sekunder"], "Saving..." : "Lagrer...", "Dismiss" : "Forkast", "This action requires you to confirm your password" : "Denne handlingen krever at du bekrefter ditt passord", @@ -59,6 +60,7 @@ OC.L10N.register( "seconds ago" : "for få sekunder siden", "Logging in …" : "Logger inn...", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.", + "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Det vil ikke være mulig å gjennopprette dine data etter at passordet ditt er satt på nytt.<br />Hvis du ikke er sikker på hva du skal gjøre, vennligst kontakt din administrator før du fortsetter. <br />Vil du virkelig fortsette?", "I know what I'm doing" : "Jeg vet hva jeg gjør", "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.", "No" : "Nei", @@ -112,6 +114,7 @@ OC.L10N.register( "Press ⌘-C to copy." : "Trykk ⌘-C for å kopiere", "Press Ctrl-C to copy." : "Trykk Ctrl-C for å kopiere", "Resharing is not allowed" : "Videre deling er ikke tillatt", + "Share to {name}" : "Dele med {name}", "Share link" : "Del lenke", "Link" : "Lenke", "Password protect" : "Passordbeskyttet", @@ -135,12 +138,15 @@ OC.L10N.register( "access control" : "tilgangskontroll", "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", + "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Minst {count} tegn er nødvendig for autofullføring","Minst {count} antall tegn er nødvendig for autofullføring"], + "This list is maybe truncated - please refine your search term to see more results." : "Listen kan bli avkortet - vennligst juster søket ditt for å se flere resultat.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", "No users found for {search}" : "Ingen brukere funnet for {search}", "An error occurred. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (remote)" : "{sharee} (ekstern)", "{sharee} (email)" : "{sharee} (email)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Del", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruke «Federated Cloud ID» brukernavn@eksempel.com/nextcloud", "Share with users or by mail..." : "Del med brukere eller på e-post...", @@ -171,6 +177,7 @@ OC.L10N.register( "sunny" : "solfylt", "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Dette er dine søketreff<script>alert(1)</script></strong>", "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The update is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen på enkelte systemer.", @@ -180,7 +187,9 @@ OC.L10N.register( "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Vennligst rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud miljøet</a>.", "Continue to Nextcloud" : "Fortsett til Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekunder."], "Searching other places" : "Søker andre steder", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søkeresultat i en annen mappe","{count} søkeresultater i andre mapper"], "Personal" : "Personlig", "Users" : "Brukere", @@ -233,6 +242,7 @@ OC.L10N.register( "Need help?" : "Trenger du hjelp?", "See the documentation" : "Se dokumentasjonen", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.", + "More apps" : "Flere apper", "Search" : "Søk", "Log out" : "Logg ut", "This action requires you to confirm your password:" : "Denne handlingen krever at du bekrefter ditt passord:", diff --git a/core/l10n/nb.json b/core/l10n/nb.json index 10e7d515612..c4483a55fd1 100644 --- a/core/l10n/nb.json +++ b/core/l10n/nb.json @@ -46,6 +46,7 @@ "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>", "Settings" : "Innstillinger", "Connection to server lost" : "Mistet tilkobling til tjener", + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem ved lasting av side, laster på nytt om %n sekund","Problem ved lasting av side, laster på nytt om %n sekunder"], "Saving..." : "Lagrer...", "Dismiss" : "Forkast", "This action requires you to confirm your password" : "Denne handlingen krever at du bekrefter ditt passord", @@ -57,6 +58,7 @@ "seconds ago" : "for få sekunder siden", "Logging in …" : "Logger inn...", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.", + "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Det vil ikke være mulig å gjennopprette dine data etter at passordet ditt er satt på nytt.<br />Hvis du ikke er sikker på hva du skal gjøre, vennligst kontakt din administrator før du fortsetter. <br />Vil du virkelig fortsette?", "I know what I'm doing" : "Jeg vet hva jeg gjør", "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.", "No" : "Nei", @@ -110,6 +112,7 @@ "Press ⌘-C to copy." : "Trykk ⌘-C for å kopiere", "Press Ctrl-C to copy." : "Trykk Ctrl-C for å kopiere", "Resharing is not allowed" : "Videre deling er ikke tillatt", + "Share to {name}" : "Dele med {name}", "Share link" : "Del lenke", "Link" : "Lenke", "Password protect" : "Passordbeskyttet", @@ -133,12 +136,15 @@ "access control" : "tilgangskontroll", "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", + "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Minst {count} tegn er nødvendig for autofullføring","Minst {count} antall tegn er nødvendig for autofullføring"], + "This list is maybe truncated - please refine your search term to see more results." : "Listen kan bli avkortet - vennligst juster søket ditt for å se flere resultat.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", "No users found for {search}" : "Ingen brukere funnet for {search}", "An error occurred. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (remote)" : "{sharee} (ekstern)", "{sharee} (email)" : "{sharee} (email)", + "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Del", "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruke «Federated Cloud ID» brukernavn@eksempel.com/nextcloud", "Share with users or by mail..." : "Del med brukere eller på e-post...", @@ -169,6 +175,7 @@ "sunny" : "solfylt", "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", + "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Dette er dine søketreff<script>alert(1)</script></strong>", "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The update is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen på enkelte systemer.", @@ -178,7 +185,9 @@ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Vennligst rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud miljøet</a>.", "Continue to Nextcloud" : "Fortsett til Nextcloud", + "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekunder."], "Searching other places" : "Søker andre steder", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søkeresultat i en annen mappe","{count} søkeresultater i andre mapper"], "Personal" : "Personlig", "Users" : "Brukere", @@ -231,6 +240,7 @@ "Need help?" : "Trenger du hjelp?", "See the documentation" : "Se dokumentasjonen", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.", + "More apps" : "Flere apper", "Search" : "Søk", "Log out" : "Logg ut", "This action requires you to confirm your password:" : "Denne handlingen krever at du bekrefter ditt passord:", diff --git a/core/vendor/davclient.js/.bower.json b/core/vendor/davclient.js/.bower.json index 5ae36dac534..485af9e0885 100644 --- a/core/vendor/davclient.js/.bower.json +++ b/core/vendor/davclient.js/.bower.json @@ -1,6 +1,6 @@ { "name": "davclient.js", - "version": "0.0.1", + "version": "0.1.1", "authors": [ "Evert Pot <me@evertpot.com>" ], @@ -20,13 +20,14 @@ "test", "tests" ], - "_release": "0.0.1", + "_release": "0.1.1", "_resolution": { "type": "version", - "tag": "0.0.1", - "commit": "2d054c63ba5bf7f7d40de904a742f3ad9c71e63c" + "tag": "0.1.1", + "commit": "a2731f81540816b212c09d14596621cb070a4f10" }, "_source": "https://github.com/evert/davclient.js.git", - "_target": "*", - "_originalSource": "https://github.com/evert/davclient.js.git" + "_target": "0.1.1", + "_originalSource": "https://github.com/evert/davclient.js.git", + "_direct": true }
\ No newline at end of file diff --git a/core/vendor/davclient.js/lib/client.js b/core/vendor/davclient.js/lib/client.js index db1a1954aff..0fc3f61f9f6 100644 --- a/core/vendor/davclient.js/lib/client.js +++ b/core/vendor/davclient.js/lib/client.js @@ -1,3 +1,8 @@ +/* + * vim: expandtab shiftwidth=4 softtabstop=4 + */ + +/* global dav */ if (typeof dav == 'undefined') { dav = {}; }; dav._XML_CHAR_MAP = { @@ -100,10 +105,42 @@ dav.Client.prototype = { }, /** + * Renders a "d:set" block for the given properties. + * + * @param {Object.<String,String>} properties + * @return {String} XML "<d:set>" block + */ + _renderPropSet: function(properties) { + var body = ' <d:set>\n' + + ' <d:prop>\n'; + + for(var ii in properties) { + var property = this.parseClarkNotation(ii); + var propName; + var propValue = properties[ii]; + if (this.xmlNamespaces[property.namespace]) { + propName = this.xmlNamespaces[property.namespace] + ':' + property.name; + } else { + propName = 'x:' + property.name + ' xmlns:x="' + property.namespace + '"'; + } + + // FIXME: hard-coded for now until we allow properties to + // specify whether to be escaped or not + if (propName !== 'd:resourcetype') { + propValue = dav._escapeXml(propValue); + } + body += ' <' + propName + '>' + propValue + '</' + propName + '>\n'; + } + body +=' </d:prop>\n'; + body +=' </d:set>\n'; + return body; + }, + + /** * Generates a propPatch request. * * @param {string} url Url to do the proppatch request on - * @param {Array} properties List of properties to store. + * @param {Object.<String,String>} properties List of properties to store. * @param {Object} [headers] headers * @return {Promise} */ @@ -119,27 +156,48 @@ dav.Client.prototype = { for (namespace in this.xmlNamespaces) { body += ' xmlns:' + this.xmlNamespaces[namespace] + '="' + namespace + '"'; } - body += '>\n' + - ' <d:set>\n' + - ' <d:prop>\n'; + body += '>\n' + this._renderPropSet(properties); + body += '</d:propertyupdate>'; - for(var ii in properties) { + return this.request('PROPPATCH', url, headers, body).then( + function(result) { + return { + status: result.status, + body: result.body, + xhr: result.xhr + }; + }.bind(this) + ); - var property = this.parseClarkNotation(ii); - var propName; - var propValue = properties[ii]; - if (this.xmlNamespaces[property.namespace]) { - propName = this.xmlNamespaces[property.namespace] + ':' + property.name; - } else { - propName = 'x:' + property.name + ' xmlns:x="' + property.namespace + '"'; + }, + + /** + * Generates a MKCOL request. + * If attributes are given, it will use an extended MKCOL request. + * + * @param {string} url Url to do the proppatch request on + * @param {Object.<String,String>} [properties] list of properties to store. + * @param {Object} [headers] headers + * @return {Promise} + */ + mkcol : function(url, properties, headers) { + var body = ''; + headers = headers || {}; + headers['Content-Type'] = 'application/xml; charset=utf-8'; + + if (properties) { + body = + '<?xml version="1.0"?>\n' + + '<d:mkcol'; + var namespace; + for (namespace in this.xmlNamespaces) { + body += ' xmlns:' + this.xmlNamespaces[namespace] + '="' + namespace + '"'; } - body += ' <' + propName + '>' + dav._escapeXml(propValue) + '</' + propName + '>\n'; + body += '>\n' + this._renderPropSet(properties); + body +='</d:mkcol>'; } - body+=' </d:prop>\n'; - body+=' </d:set>\n'; - body+='</d:propertyupdate>'; - return this.request('PROPPATCH', url, headers, body).then( + return this.request('MKCOL', url, headers, body).then( function(result) { return { status: result.status, @@ -293,10 +351,9 @@ dav.Client.prototype = { var propStatNode = propStatIterator.iterateNext(); while(propStatNode) { - var propStat = { status : doc.evaluate('string(d:status)', propStatNode, resolver, XPathResult.ANY_TYPE, null).stringValue, - properties : [], + properties : {}, }; var propIterator = doc.evaluate('d:prop/*', propStatNode, resolver, XPathResult.ANY_TYPE, null); diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index a09f246e6b3..f3252f0fd65 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -29,6 +29,7 @@ use OCP\Files\Config\IHomeMountProvider; use OCP\Files\Config\IMountProviderCollection; use OCP\Files\Config\IMountProvider; use OCP\Files\Config\IUserMountCache; +use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountPoint; use OCP\Files\Storage\IStorageFactory; use OCP\IUser; @@ -84,6 +85,37 @@ class MountProviderCollection implements IMountProviderCollection, Emitter { }, array()); } + public function addMountForUser(IUser $user, IMountManager $mountManager) { + // shared mount provider gets to go last since it needs to know existing files + // to check for name collisions + $firstMounts = []; + $firstProviders = array_filter($this->providers, function (IMountProvider $provider) { + return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider'); + }); + $lastProviders = array_filter($this->providers, function (IMountProvider $provider) { + return (get_class($provider) === 'OCA\Files_Sharing\MountProvider'); + }); + foreach ($firstProviders as $provider) { + $mounts = $provider->getMountsForUser($user, $this->loader); + if (is_array($mounts)) { + $firstMounts = array_merge($firstMounts, $mounts); + } + } + array_walk($firstMounts, [$mountManager, 'addMount']); + + $lateMounts = []; + foreach ($lastProviders as $provider) { + $mounts = $provider->getMountsForUser($user, $this->loader); + if (is_array($mounts)) { + $lateMounts = array_merge($lateMounts, $mounts); + } + } + + array_walk($lateMounts, [$mountManager, 'addMount']); + + return array_merge($lateMounts, $firstMounts); + } + /** * Get the configured home mount for this user * @@ -110,6 +142,7 @@ class MountProviderCollection implements IMountProviderCollection, Emitter { */ public function registerProvider(IMountProvider $provider) { $this->providers[] = $provider; + $this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]); } diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 51e494c372e..22b14e44074 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -443,8 +443,7 @@ class Filesystem { // Chance to mount for other storages if ($userObject) { - $mounts = $mountConfigManager->getMountsForUser($userObject); - array_walk($mounts, array(self::$mounts, 'addMount')); + $mounts = $mountConfigManager->addMountForUser($userObject, self::getMountManager()); $mounts[] = $homeMount; $mountConfigManager->registerMounts($userObject, $mounts); } diff --git a/resources/codesigning/owncloud.crt b/resources/codesigning/owncloud.crt deleted file mode 100644 index cbd82898bab..00000000000 --- a/resources/codesigning/owncloud.crt +++ /dev/null @@ -1,66 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFtDCCA5ygAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwZTELMAkGA1UEBhMCVVMx -DzANBgNVBAgMBkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjEtMCsGA1UE -Awwkb3duQ2xvdWQgQ29kZSBTaWduaW5nIFJvb3QgQXV0aG9yaXR5MB4XDTE2MDIw -MzE3NDMyNVoXDTI2MDEzMTE3NDMyNVowbTELMAkGA1UEBhMCVVMxDzANBgNVBAgM -BkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjE1MDMGA1UEAwwsb3duQ2xv -dWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBBdXRob3JpdHkwggIiMA0GCSqG -SIb3DQEBAQUAA4ICDwAwggIKAoICAQDKMul4pWev6vtgzB73CLQPMy8nDZGbvqII -IgukQluMeLCW0P09I+J/mCiDd99mQTtWO+/LcpOChHYJ59qQz+g9TzKlVSuFDg47 -pc+jUvTLGGEDf9cAWtzsXYXlb9z7sTln/8JAvy8ghmaR/4JWU4hM/nmgDCpeXLLJ -NFrxKDbzPLYj53iHN+XyE9GT6sDYoQd1BIWhTsMdvMqg870Jw2yN4hKw3V7/KoI/ -Z5CAA9dP4tAmltBpMz79dmLCciqXOD8mWEWl2tSZU+/WVyPxiE19IHoJETOhSg4c -eud4DDdFt9Ohm4owvpxxRDbvV+Ic6sWb1gJBrM7/XJDmaUObpowjx8Daof1MuoHs -FKh6/Y7RBdVlrp/ig3htxfm9BBMqnXIxgFWDiSbjCMk0Ygvx49gKMnVoRhZ/7pla -j5nTRdbhsjS50E9zfc53EltM27YSwNZu62QKsU4yumg8UOhOYPRLHcySvNyyMZXS -o+Kst27oGSgurHytFS7FVG1M3UUn67zkMpnnMYhfx8dz7+tupY9e0l0kDciwvNAO -YrnvHoEiIbJmoyYOhL2j9WErUhAb3JKTSdYC0MmjaZZPv0HwCemx+rnApcoszmFG -woZTRAa6Q64WGxlmFq0vsgmcTNsTzlYY20Kv+ZpZOiVYonyHFkorKWdsXKZQcnYq -dcMqYxQE6wIDAQABo2YwZDAdBgNVHQ4EFgQUfZoNPRneQ1pk9SZT9A2lpG4Hw7Mw -HwYDVR0jBBgwFoAUcZdiBiGr+Y+OH2DrlNwK03zWH+YwEgYDVR0TAQH/BAgwBgEB -/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAA2hoAEdbdM9 -+ZA/q7UppF4BiKrSQNAQHLDwodutRY+gBYQsWpo8wLqdLvRVhlwDn3KmJEMfaDQm -5YM+/snBkew9olCIyYw+t7xYtNhoW1et/nNNDL+Qq7uyH6g+uOMp4m3c+BMv4x5H -EP3z7PY1qrPOVvzZu8o2iL8qpC0sXTKZy+xG/9VTYGnxCcG+V/Ua5aHOyetUttoN -bxEcEQHHe07V+JlCPuI53hPsiGgzHv+nz/1sJV95mn9w88SHY0JO9bHp9w+mq92K -r0Nv6Wctf7vNVmIOdRFHWOFie4+D3TpBSnB5PPQRbtf6IVEhjmcnWYBWcRGhH6cR -4dqpuqzwVFopIFLYMeaeKGu8wZHi2YRrkFcrnqqmFI9RtBbt3eyfUQcKH7b9P4Ri -qamb/h9sVjDM4wSQ6n+Qa2dgV28O0il35roa3qwvqySgn1wXS5CsAaeB1VWAS6/S -v1WFt93n9LrraV4EUuu1BGXp525aVn6v+B71zN4JzYnHVE4yAb0EdOpKrlfmCCm/ -9Z90+BF2uK3QnpkyrH+LEOQoHrlAt80RZYd2Tl/K1WWNrPUlnCGXdxjVYakVRnfy -Ud0KV4RsD93mNw/t2gU5U+SyYWU2fTJUE9qdJ4Ndw7B2DZ/5dcsu0rDV4sXkUoDY -+Dr25NoOcuqjCWRw2T3SBPSXBxjlhRTQ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFsDCCA5igAwIBAgIJALFuk51OGp2KMA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNV -BAYTAlVTMQ8wDQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4x -LTArBgNVBAMMJG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTAe -Fw0xNjAyMDMxNzM5NThaFw0yNjAxMzExNzM5NThaMGUxCzAJBgNVBAYTAlVTMQ8w -DQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xLTArBgNVBAMM -JG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTCCAiIwDQYJKoZI -hvcNAQEBBQADggIPADCCAgoCggIBAJmTnGtGaB0cDtQPxWr2r5FyXFzJ6GIkm4Lb -7iY/DYpIEarbRFwqDCDZ00V+PWsTBBF6qXW5W7eZ+fOOdIEGoNaDuGtIlGVjj3Dz -TZtmcFg0euimfLNYVvYZlPPh4kS3zDRZs30AgAdgq4RHWC4qjElWcVKTwERNQ2ln -gRFRQEv+i2DI7sEK9ZpK7B1SfJ1o1fm/kPL7bVfiYda+QKp0vOxBecDnGV+rfz4t -DT6mBOgwAiZnwojuiigfUJxSisv3roWri+0O+0TiXglV+oUtkIRrs0etkQGWAlgn -H4CC+sZ5N2TiGPH1hksLkXP4mymlio8/x7ax0WfcxeTZu3ok9eK5fwIQVWam6dd9 -klCqZVttKodZYspvdFfwqMlf4lPEIY+r2PIdGjUhKu4FsDhORaGj8WMYRJUR44ls -/r2ktCB/TOsh8DW2Pi9HAgxI4mrdmvL0WMSOBFZRcSC/nTz977oi1iiB2T+s7V0Z -Y0AHMQYiIn83MFB7rb+mVlEoLID/evVSTfUaUaO8DqcfeQN/OFM/zcJY9YHv8AlJ -3b8CPdeX9edMnyZWNdrhOSawjAbOBIna3o66RXdeC3oWg7FuckJmy7JLtRCJ2Owu -losRAxe0z5mQmjFzMczxCYJQ4A+4U5UZwbd/MQJg508StcOumroYqruDic/Wbc3C -v6DupG8dAgMBAAGjYzBhMB0GA1UdDgQWBBRxl2IGIav5j44fYOuU3ArTfNYf5jAf -BgNVHSMEGDAWgBRxl2IGIav5j44fYOuU3ArTfNYf5jAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAR6IZBOBw3KzRxvUP -+46RZYayMrdLyAgMzbDvQe7WCaeuA2UoPVL8jN7X2Lvw12Mz84+EKs1voR0OBxlY -6muuyl0SETa2k4UtklVscMvcokG+m5aVNJ7/HHGFmKsTyJDMxSzDA/r3KRPXZOwV -CLUVTkr5fQbIaVljA89U2p3pN/X7gNq89xi/XiszNCEIvvSscRmBGlRmx4XbjXHK -XKO74+HiM/ahqUI792ae97jlsy9jG4OIelse3+e1KBWNsGtU90asnUHgyMXVL8gp -ocznGvWceAhkcogUCUCXq1Rh/mKcGQdi2z0g/X+MGzfA9Ij4NQZLnNPh2UjgxCtG -KWPUzs0t/xoCtJh1WpwqTrOUcYqFAaBa282sD/O8tX4t076aGKdbhfo6tvaOFwDU -iRPgdMol++BFnfCld53Yivg2+S6+xo1wzuPkNjVFXHjx9vMyiov/HHKqJoBsuCwU -7VegzM/6Cvh32lSZfUHsfynCab/7vv923KyaANWxb0QsHZSSt+mmOK3ZmC96vCEa -55IGNckOvOGW9yCIz3Q0kEj2hoJs1bw0SkwGWs7N1TkugQjM/S7/Im1LJUxdtqQK -Zjn+8U6U3TR1aKLYEdqHCGcVoRXKDG/S40FHxyeV/9buTI7SSvhzZfj+qasmJe1L -Kd08UdS/im8RwbVSS1mih5hbAHg= ------END CERTIFICATE-----
\ No newline at end of file diff --git a/settings/Controller/ChangePasswordController.php b/settings/Controller/ChangePasswordController.php index 832cdbefdbe..b82751bcac2 100644 --- a/settings/Controller/ChangePasswordController.php +++ b/settings/Controller/ChangePasswordController.php @@ -217,7 +217,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Please provide an admin recovery password, otherwise all user data will be lost'), + 'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'), ] ]); } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) { diff --git a/settings/l10n/cs.js b/settings/l10n/cs.js index c3bfdd57ee3..8270066c25d 100644 --- a/settings/l10n/cs.js +++ b/settings/l10n/cs.js @@ -20,6 +20,7 @@ OC.L10N.register( "Unable to add group." : "Nelze přidat skupinu.", "Unable to delete group." : "Nelze smazat skupinu.", "test email settings" : "Test nastavení emailu", + "Mail could not be sent. Check your mail server log" : "E-mail se nepodařilo odeslat. Zkontrolujte protokol e-mailového serveru", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Při odesílání emailu nastala chyba. Překontrolujte prosím svá nastavení. (Error: %s)", "Email sent" : "Email odeslán", "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních emailů musíte nejprve nastavit svou emailovou adresu.", @@ -267,6 +268,7 @@ OC.L10N.register( "Getting help" : "Sehnat pomoc", "Commercial support" : "Placená podpora", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Používáte <strong>%s</strong> z <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Profilový obrázek", "Upload new" : "Nahrát nový", "Select from Files" : "Vybrat ze Souborů", diff --git a/settings/l10n/cs.json b/settings/l10n/cs.json index ec21a774a83..112bcca143a 100644 --- a/settings/l10n/cs.json +++ b/settings/l10n/cs.json @@ -18,6 +18,7 @@ "Unable to add group." : "Nelze přidat skupinu.", "Unable to delete group." : "Nelze smazat skupinu.", "test email settings" : "Test nastavení emailu", + "Mail could not be sent. Check your mail server log" : "E-mail se nepodařilo odeslat. Zkontrolujte protokol e-mailového serveru", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Při odesílání emailu nastala chyba. Překontrolujte prosím svá nastavení. (Error: %s)", "Email sent" : "Email odeslán", "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních emailů musíte nejprve nastavit svou emailovou adresu.", @@ -265,6 +266,7 @@ "Getting help" : "Sehnat pomoc", "Commercial support" : "Placená podpora", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Používáte <strong>%s</strong> z <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Profilový obrázek", "Upload new" : "Nahrát nový", "Select from Files" : "Vybrat ze Souborů", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 6f9027ec3fd..bdc81837203 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -268,6 +268,7 @@ OC.L10N.register( "Getting help" : "Obtener ayuda", "Commercial support" : "Soporte Comercial", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Estas usando <strong>%s</strong> de <strong>%s</strong> ", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Está usando <strong>%s</strong> de <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Foto de perfil", "Upload new" : "Subir otra", "Select from Files" : "Seleccionar desde Archivos", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index fd169e50a2f..54c85e1e254 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -266,6 +266,7 @@ "Getting help" : "Obtener ayuda", "Commercial support" : "Soporte Comercial", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Estas usando <strong>%s</strong> de <strong>%s</strong> ", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Está usando <strong>%s</strong> de <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Foto de perfil", "Upload new" : "Subir otra", "Select from Files" : "Seleccionar desde Archivos", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index b97df80e5ed..11af9e6d5c7 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -20,6 +20,7 @@ OC.L10N.register( "Unable to add group." : "Ekki tókst að bæta hóp við.", "Unable to delete group." : "Get ekki eytt hópi.", "test email settings" : "prófa tölvupóststillingar", + "Mail could not be sent. Check your mail server log" : "Ekki var hægt að senda póst. Skoðaðu annál póstþjónsins", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)", "Email sent" : "Tölvupóstur sendur", "You need to set your user email before being able to send test emails." : "Þú verður að gefa upp netfangið þitt svo að þú getir sent prófunarpósta.", @@ -267,6 +268,7 @@ OC.L10N.register( "Getting help" : "Til að fá hjálp", "Commercial support" : "Gjaldskyld tækniaðstoð", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Þú notar <strong>%s</strong> af <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "You are using <strong>%s</strong> af <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Einkennismynd", "Upload new" : "Senda inn nýtt", "Select from Files" : "Veldu skrár", diff --git a/settings/l10n/is.json b/settings/l10n/is.json index 455f1ff4f51..9868d3d54bc 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -18,6 +18,7 @@ "Unable to add group." : "Ekki tókst að bæta hóp við.", "Unable to delete group." : "Get ekki eytt hópi.", "test email settings" : "prófa tölvupóststillingar", + "Mail could not be sent. Check your mail server log" : "Ekki var hægt að senda póst. Skoðaðu annál póstþjónsins", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)", "Email sent" : "Tölvupóstur sendur", "You need to set your user email before being able to send test emails." : "Þú verður að gefa upp netfangið þitt svo að þú getir sent prófunarpósta.", @@ -265,6 +266,7 @@ "Getting help" : "Til að fá hjálp", "Commercial support" : "Gjaldskyld tækniaðstoð", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Þú notar <strong>%s</strong> af <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "You are using <strong>%s</strong> af <strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "Einkennismynd", "Upload new" : "Senda inn nýtt", "Select from Files" : "Veldu skrár", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index bb945f9c0c7..7321c5f2c08 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -20,6 +20,7 @@ OC.L10N.register( "Unable to add group." : "グループを追加できません", "Unable to delete group." : "グループを削除できません", "test email settings" : "メール設定のテスト", + "Mail could not be sent. Check your mail server log" : "メールが送信できませんでした。メールサーバーのログを確認してください", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "メールの送信中に問題が発生しました。設定を確認してください。 (Error: %s)", "Email sent" : "メールを送信しました", "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。", @@ -267,6 +268,7 @@ OC.L10N.register( "Getting help" : "ヘルプの入手", "Commercial support" : "商用サポート", "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "<strong>%s</strong> / <strong>%s</strong> (<strong>%s %%</strong>) 使用中", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", "Select from Files" : "ファイルから選択", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 8f9345b488e..21ac13e056f 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -18,6 +18,7 @@ "Unable to add group." : "グループを追加できません", "Unable to delete group." : "グループを削除できません", "test email settings" : "メール設定のテスト", + "Mail could not be sent. Check your mail server log" : "メールが送信できませんでした。メールサーバーのログを確認してください", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "メールの送信中に問題が発生しました。設定を確認してください。 (Error: %s)", "Email sent" : "メールを送信しました", "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。", @@ -265,6 +266,7 @@ "Getting help" : "ヘルプの入手", "Commercial support" : "商用サポート", "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "<strong>%s</strong> / <strong>%s</strong> (<strong>%s %%</strong>) 使用中", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", "Select from Files" : "ファイルから選択", diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js index 37091947ce0..aaf2569c7d7 100644 --- a/settings/l10n/sk.js +++ b/settings/l10n/sk.js @@ -120,7 +120,7 @@ OC.L10N.register( "Error creating user: {message}" : "Chyba pri vytváraní používateľa: {message}", "A valid password must be provided" : "Musíte zadať platné heslo", "A valid email must be provided" : "Musíte zadať platnú emailovú adresu", - "__language_name__" : "Slovensky", + "__language_name__" : "Slovenský", "Unlimited" : "Nelimitované", "Personal info" : "Osobné informácie", "App passwords" : "Heslá aplikácie", @@ -249,6 +249,7 @@ OC.L10N.register( "Website" : "Webstránka", "Your website" : "Vaša webstránka", "Twitter" : "Twitter", + "Your Twitter handle" : "Vaša stránka na Twitteri", "You are member of the following groups:" : "Ste členom nasledovných skupín:", "Password" : "Heslo", "Current password" : "Aktuálne heslo", diff --git a/settings/l10n/sk.json b/settings/l10n/sk.json index 75d7983d4a4..f14ea056073 100644 --- a/settings/l10n/sk.json +++ b/settings/l10n/sk.json @@ -118,7 +118,7 @@ "Error creating user: {message}" : "Chyba pri vytváraní používateľa: {message}", "A valid password must be provided" : "Musíte zadať platné heslo", "A valid email must be provided" : "Musíte zadať platnú emailovú adresu", - "__language_name__" : "Slovensky", + "__language_name__" : "Slovenský", "Unlimited" : "Nelimitované", "Personal info" : "Osobné informácie", "App passwords" : "Heslá aplikácie", @@ -247,6 +247,7 @@ "Website" : "Webstránka", "Your website" : "Vaša webstránka", "Twitter" : "Twitter", + "Your Twitter handle" : "Vaša stránka na Twitteri", "You are member of the following groups:" : "Ste členom nasledovných skupín:", "Password" : "Heslo", "Current password" : "Aktuálne heslo", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index c92f605002b..4678b1dd4c7 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -20,6 +20,7 @@ OC.L10N.register( "Unable to add group." : "无法添加分组.", "Unable to delete group." : "无法删除分组.", "test email settings" : "测试电子邮件设置", + "Mail could not be sent. Check your mail server log" : "邮件无法发送. 检查你的邮件服务器日志", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题. 请修正您的设置. (错误: %s)", "Email sent" : "邮件已发送", "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的电子邮件地址.", @@ -267,6 +268,7 @@ OC.L10N.register( "Getting help" : "获取帮助", "Commercial support" : "商业支持", "You are using <strong>%s</strong> of <strong>%s</strong>" : "您正在使用 <strong>%s</strong> of <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "你使用了<strong>%s</strong> 于<strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "账户头像", "Upload new" : "上传", "Select from Files" : "选择文件", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index e6b902ae655..105b66b5da6 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -18,6 +18,7 @@ "Unable to add group." : "无法添加分组.", "Unable to delete group." : "无法删除分组.", "test email settings" : "测试电子邮件设置", + "Mail could not be sent. Check your mail server log" : "邮件无法发送. 检查你的邮件服务器日志", "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题. 请修正您的设置. (错误: %s)", "Email sent" : "邮件已发送", "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的电子邮件地址.", @@ -265,6 +266,7 @@ "Getting help" : "获取帮助", "Commercial support" : "商业支持", "You are using <strong>%s</strong> of <strong>%s</strong>" : "您正在使用 <strong>%s</strong> of <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "你使用了<strong>%s</strong> 于<strong>%s</strong> (<strong>%s %%</strong>)", "Profile picture" : "账户头像", "Upload new" : "上传", "Select from Files" : "选择文件", |