diff options
Diffstat (limited to 'apps')
46 files changed, 269 insertions, 51 deletions
diff --git a/apps/comments/l10n/nl.js b/apps/comments/l10n/nl.js index 5772952a291..d168c0658db 100644 --- a/apps/comments/l10n/nl.js +++ b/apps/comments/l10n/nl.js @@ -13,7 +13,7 @@ OC.L10N.register( "[Deleted user]" : "[Verwijderde gebruiker]", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", - "Save" : "Bewaren", + "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", "Comment" : "Reactie" diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json index a8c92241a77..74050c7f816 100644 --- a/apps/comments/l10n/nl.json +++ b/apps/comments/l10n/nl.json @@ -11,7 +11,7 @@ "[Deleted user]" : "[Verwijderde gebruiker]", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", - "Save" : "Bewaren", + "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", "Comment" : "Reactie" diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php index 41dcb421913..95a5f0a8749 100644 --- a/apps/dav/lib/connector/sabre/node.php +++ b/apps/dav/lib/connector/sabre/node.php @@ -230,7 +230,7 @@ abstract class Node implements \Sabre\DAV\INode { if ($this->info->isDeletable()) { $p .= 'D'; } - if ($this->info->isDeletable()) { + if ($this->info->isUpdateable()) { $p .= 'NV'; // Renameable, Moveable } if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) { diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php index dfbd95bfad8..8c92c2f063c 100644 --- a/apps/dav/tests/unit/connector/sabre/node.php +++ b/apps/dav/tests/unit/connector/sabre/node.php @@ -31,8 +31,8 @@ class Node extends \Test\TestCase { array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'), array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RDNV'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RD'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'), ); diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js index 3b87ed3beb1..9b017eee43f 100644 --- a/apps/encryption/l10n/de_DE.js +++ b/apps/encryption/l10n/de_DE.js @@ -27,6 +27,7 @@ OC.L10N.register( "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Bad Signature" : "Falsche Signatur", "Missing Signature" : "Fehlende Signatur", + "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json index 6d247b09bc9..a3754c75846 100644 --- a/apps/encryption/l10n/de_DE.json +++ b/apps/encryption/l10n/de_DE.json @@ -25,6 +25,7 @@ "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Bad Signature" : "Falsche Signatur", "Missing Signature" : "Fehlende Signatur", + "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js index e836ed04d29..d810cbf4218 100644 --- a/apps/federation/l10n/de.js +++ b/apps/federation/l10n/de.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Füge einen mit ownCloud Federation verbundenen Server automatisch hinzu, sobald die Verbindung einmal erfolgreich erstellt wurde", + "Trusted ownCloud Servers" : "vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json index 9585cdd87db..c8fafc9166d 100644 --- a/apps/federation/l10n/de.json +++ b/apps/federation/l10n/de.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Füge einen mit ownCloud Federation verbundenen Server automatisch hinzu, sobald die Verbindung einmal erfolgreich erstellt wurde", + "Trusted ownCloud Servers" : "vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js index f590b47b8bf..4ce958bbf23 100644 --- a/apps/federation/l10n/de_DE.js +++ b/apps/federation/l10n/de_DE.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde", + "Trusted ownCloud Servers" : "Vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json index e46dc186f1b..82bbecc563d 100644 --- a/apps/federation/l10n/de_DE.json +++ b/apps/federation/l10n/de_DE.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde", + "Trusted ownCloud Servers" : "Vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/fi_FI.js b/apps/federation/l10n/fi_FI.js index b9f813e993d..3a2d85a51b6 100644 --- a/apps/federation/l10n/fi_FI.js +++ b/apps/federation/l10n/fi_FI.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "ownCloud-palvelinta ei löydy", "Could not add server" : "Palvelimen lisääminen ei onnistunut", "Federation" : "Federaatio", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", + "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet", + "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin", + "ownCloud Server" : "ownCloud-palvelin" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/fi_FI.json b/apps/federation/l10n/fi_FI.json index 0c8280ab0be..8060a437617 100644 --- a/apps/federation/l10n/fi_FI.json +++ b/apps/federation/l10n/fi_FI.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "ownCloud-palvelinta ei löydy", "Could not add server" : "Palvelimen lisääminen ei onnistunut", "Federation" : "Federaatio", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", + "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet", + "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin", + "ownCloud Server" : "ownCloud-palvelin" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/fr.js b/apps/federation/l10n/fr.js index f796acbcc83..c1533771f18 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance.", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créer avec succès .", + "Trusted ownCloud Servers" : "Serveur ownCloud de confiance ", + "+ Add ownCloud server" : "Ajouter un serveur Owncloud", + "ownCloud Server" : "Serveur OwnCloud" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index c00b0474466..8863bc73810 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance.", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créer avec succès .", + "Trusted ownCloud Servers" : "Serveur ownCloud de confiance ", + "+ Add ownCloud server" : "Ajouter un serveur Owncloud", + "ownCloud Server" : "Serveur OwnCloud" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/it.js b/apps/federation/l10n/it.js index 2f5a8be4798..c9a0de56f03 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Nessun server ownCloud trovato", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata.", + "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", + "Trusted ownCloud Servers" : "Server ownCloud di fiducia", + "+ Add ownCloud server" : "+ Aggiungi server ownCloud", + "ownCloud Server" : "Server ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 69b8eb18196..9c22c4bb29c 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Nessun server ownCloud trovato", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata.", + "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", + "Trusted ownCloud Servers" : "Server ownCloud di fiducia", + "+ Add ownCloud server" : "+ Aggiungi server ownCloud", + "ownCloud Server" : "Server ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ja.js b/apps/federation/l10n/ja.js index c97647f9755..3ea46d85b75 100644 --- a/apps/federation/l10n/ja.js +++ b/apps/federation/l10n/ja.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "ownCloudサーバーが見つかりません", "Could not add server" : "サーバーを追加できませんでした", "Federation" : "連携", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。" + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。", + "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", + "Trusted ownCloud Servers" : "ownCloudサーバを信頼する", + "+ Add ownCloud server" : "ownCloudサーバを追加", + "ownCloud Server" : "ownCloudサーバ" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ja.json b/apps/federation/l10n/ja.json index d074b189c7e..48c53f63137 100644 --- a/apps/federation/l10n/ja.json +++ b/apps/federation/l10n/ja.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "ownCloudサーバーが見つかりません", "Could not add server" : "サーバーを追加できませんでした", "Federation" : "連携", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。" + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。", + "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", + "Trusted ownCloud Servers" : "ownCloudサーバを信頼する", + "+ Add ownCloud server" : "ownCloudサーバを追加", + "ownCloud Server" : "ownCloudサーバ" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/nb_NO.js b/apps/federation/l10n/nb_NO.js index 2366f2e9298..6dcaec43573 100644 --- a/apps/federation/l10n/nb_NO.js +++ b/apps/federation/l10n/nb_NO.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Ingen ownCloud-server funnet", "Could not add server" : "Kunne ikke legge til server", "Federation" : "Sammenknytting", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk.", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", + "Trusted ownCloud Servers" : "Klarerte ownCloud-servere", + "+ Add ownCloud server" : "+ Ny ownCloud-server", + "ownCloud Server" : "ownCloud-server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nb_NO.json b/apps/federation/l10n/nb_NO.json index 54f0526041e..9b4ceea4674 100644 --- a/apps/federation/l10n/nb_NO.json +++ b/apps/federation/l10n/nb_NO.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Ingen ownCloud-server funnet", "Could not add server" : "Kunne ikke legge til server", "Federation" : "Sammenknytting", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk.", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", + "Trusted ownCloud Servers" : "Klarerte ownCloud-servere", + "+ Add ownCloud server" : "+ Ny ownCloud-server", + "ownCloud Server" : "ownCloud-server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/nl.js b/apps/federation/l10n/nl.js index b30d581efc6..ffd175c4ef6 100644 --- a/apps/federation/l10n/nl.js +++ b/apps/federation/l10n/nl.js @@ -6,6 +6,9 @@ OC.L10N.register( "No ownCloud server found" : "Geen ownCloud server gevonden", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie.", + "Trusted ownCloud Servers" : "Vertrouwde ownCloud Servers", + "+ Add ownCloud server" : "+ Voeg ownCloud server toe", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json index e674fccec7f..e90bd836a5c 100644 --- a/apps/federation/l10n/nl.json +++ b/apps/federation/l10n/nl.json @@ -4,6 +4,9 @@ "No ownCloud server found" : "Geen ownCloud server gevonden", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie.", + "Trusted ownCloud Servers" : "Vertrouwde ownCloud Servers", + "+ Add ownCloud server" : "+ Voeg ownCloud server toe", + "ownCloud Server" : "ownCloud Server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js index ae8f9acbe2e..a3e4e0c6754 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Nenhum servidor ownCloud encontrado", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para haja trocas de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para que haja troca de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado.", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", + "Trusted ownCloud Servers" : "Servidores OwnCloud Confiáveis", + "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", + "ownCloud Server" : "Servidor ownCloud" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index f37a3a4e28b..c09a3036975 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Nenhum servidor ownCloud encontrado", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para haja trocas de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para que haja troca de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado.", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", + "Trusted ownCloud Servers" : "Servidores OwnCloud Confiáveis", + "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", + "ownCloud Server" : "Servidor ownCloud" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sq.js b/apps/federation/l10n/sq.js index a7265017d53..9d69a1fdf80 100644 --- a/apps/federation/l10n/sq.js +++ b/apps/federation/l10n/sq.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "S’u gjet shërbyes ownCloud", "Could not add server" : "Shërbyesi s’u shtua dot", "Federation" : "Federim", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar.", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu shërbyesin pasi të jetë krijuar me sukses një ndarje e federuar", + "Trusted ownCloud Servers" : "Shërbyes ownCloud të Besuar", + "+ Add ownCloud server" : "+ Shtoni shërbyes ownCloud", + "ownCloud Server" : "Shërbyes ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sq.json b/apps/federation/l10n/sq.json index 39c86e7a7c4..67dcdcebe07 100644 --- a/apps/federation/l10n/sq.json +++ b/apps/federation/l10n/sq.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "S’u gjet shërbyes ownCloud", "Could not add server" : "Shërbyesi s’u shtua dot", "Federation" : "Federim", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar.", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu shërbyesin pasi të jetë krijuar me sukses një ndarje e federuar", + "Trusted ownCloud Servers" : "Shërbyes ownCloud të Besuar", + "+ Add ownCloud server" : "+ Shtoni shërbyes ownCloud", + "ownCloud Server" : "Shërbyes ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/css/files.css b/apps/files/css/files.css index b65af1fa0f3..bfa5340fe09 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -793,6 +793,19 @@ html.ie8 #controls .button.new { background-size: 16px 16px; } +#filestable .filename .action .icon.hidden, +#filestable .selectedActions a .icon.hidden, +#controls .actions .button .icon.hidden { + display: none; +} + +#filestable .filename .action .icon.loading, +#filestable .selectedActions a .icon.loading, +#controls .actions .button .icon.loading { + width: 15px; + height: 15px; +} + .app-files .actions .button.new .icon { margin-bottom: 2px; } diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 05ff2f0cbfa..69e32d500c4 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -659,19 +659,18 @@ * Replaces the download icon with a loading spinner and vice versa * - also adds the class disabled to the passed in element * - * @param downloadButtonElement download fileaction + * @param {jQuery} $downloadButtonElement download fileaction * @param {boolean} showIt whether to show the spinner(true) or to hide it(false) */ - OCA.Files.FileActions.updateFileActionSpinner = function(downloadButtonElement, showIt) { - var icon = downloadButtonElement.find('img'), - sourceImage = icon.attr('src'); - - if(showIt) { - downloadButtonElement.addClass('disabled'); - icon.attr('src', sourceImage.replace('actions/download.svg', 'loading-small.gif')); + OCA.Files.FileActions.updateFileActionSpinner = function($downloadButtonElement, showIt) { + var $icon = $downloadButtonElement.find('.icon'); + if (showIt) { + var $loadingIcon = $('<span class="icon loading"></span>'); + $icon.after($loadingIcon); + $icon.addClass('hidden'); } else { - downloadButtonElement.removeClass('disabled'); - icon.attr('src', sourceImage.replace('loading-small.gif', 'actions/download.svg')); + $downloadButtonElement.find('.loading').remove(); + $downloadButtonElement.find('.icon').removeClass('hidden'); } }; diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 470f2854f43..3f46a27d1f9 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -656,4 +656,24 @@ describe('OCA.Files.FileActions tests', function() { }); }); }); + describe('download spinner', function() { + var FileActions = OCA.Files.FileActions; + var $el; + + beforeEach(function() { + $el = $('<a href="#"><span class="icon icon-download"></span><span>Download</span></a>'); + }); + + it('replaces download icon with spinner', function() { + FileActions.updateFileActionSpinner($el, true); + expect($el.find('.icon.loading').length).toEqual(1); + expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(true); + }); + it('replaces spinner back with download icon with spinner', function() { + FileActions.updateFileActionSpinner($el, true); + FileActions.updateFileActionSpinner($el, false); + expect($el.find('.icon.loading').length).toEqual(0); + expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(false); + }); + }); }); diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 135e9a44eb8..cbe2f98d6b8 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -13,14 +13,18 @@ OC.L10N.register( "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Not permitted to use authentication mechanism \"%s\"" : "Nicht erlaubter Autentifizierungsmechanismus \"%s\"", "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", + "Unsatisfied authentication mechanism parameters" : "Unbefriedigende Autentifizierungs-Mechanismus Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", + "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -31,12 +35,19 @@ OC.L10N.register( "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", + "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", + "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", + "Credentials saved" : "Zugangsdaten gespeichert", + "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen", + "Credentials required" : "Zugangsdaten benötigt", "Save" : "Speichern", "Access key" : "Zugangsschlüssel", "Secret key" : "geheimer Schlüssel", @@ -53,6 +64,8 @@ OC.L10N.register( "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", + "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -83,6 +96,7 @@ OC.L10N.register( "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", "Service name" : "Dienst Name", + "Request timeout (seconds)" : "Anfrage-Zeitüberschreitung (Sekunden)", "<b>Note:</b> " : "<b>Hinweis:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 956d202ff72..a4e3d1f7306 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -11,14 +11,18 @@ "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Not permitted to use authentication mechanism \"%s\"" : "Nicht erlaubter Autentifizierungsmechanismus \"%s\"", "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", + "Unsatisfied authentication mechanism parameters" : "Unbefriedigende Autentifizierungs-Mechanismus Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", + "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -29,12 +33,19 @@ "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", + "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", + "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", + "Credentials saved" : "Zugangsdaten gespeichert", + "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen", + "Credentials required" : "Zugangsdaten benötigt", "Save" : "Speichern", "Access key" : "Zugangsschlüssel", "Secret key" : "geheimer Schlüssel", @@ -51,6 +62,8 @@ "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", + "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -81,6 +94,7 @@ "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", "Service name" : "Dienst Name", + "Request timeout (seconds)" : "Anfrage-Zeitüberschreitung (Sekunden)", "<b>Note:</b> " : "<b>Hinweis:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/fil.js b/apps/files_external/l10n/fil.js new file mode 100644 index 00000000000..e049851ae50 --- /dev/null +++ b/apps/files_external/l10n/fil.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "files_external", + { + "Username" : "Username", + "Password" : "Password" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/fil.json b/apps/files_external/l10n/fil.json new file mode 100644 index 00000000000..95d8e5f9717 --- /dev/null +++ b/apps/files_external/l10n/fil.json @@ -0,0 +1,5 @@ +{ "translations": { + "Username" : "Username", + "Password" : "Password" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 0f00952e855..9582a5a2180 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -4,22 +4,32 @@ OC.L10N.register( "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s", "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s", "External storage" : "外部存储", + "Invalid mount point" : "无效的挂载点", + "%s" : "%s", "Personal" : "个人", "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", "Enable encryption" : "启用加密", + "Enable previews" : "启用预览", + "Enable sharing" : "启用分享", "Never" : "从不", "Saved" : "已保存", + "External mount error" : "外部挂载错误", "external-storage" : "外部存储", "Username" : "用户名", "Password" : "密码", "Save" : "保存", "Access key" : "Access key", "Secret key" : "Secret key", + "Builtin" : "内置", "None" : "无", "API key" : "API密匙", + "Username and password" : "用户名和密码", + "RSA public key" : "RSA 公钥", + "Public key" : "公钥", "Amazon S3" : "Amazon S3", + "Hostname" : "主机名", "Port" : "端口", "Region" : "地区", "Enable SSL" : "启用 SSL", @@ -39,11 +49,17 @@ OC.L10N.register( "SFTP" : "SFTP", "Root" : "根路径", "SFTP with secret key login" : "包含secret key的SFTP", + "SMB / CIFS" : "SMB / CIFS", "Share" : "共享", "Domain" : "域名", "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息", "OpenStack Object Storage" : "OpenStack 对象存储", "<b>Note:</b> " : "<b>注意：</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 cURL 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 FTP 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b>“%s”尚未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "No external storage configured" : "未配置外部存储", + "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -55,6 +71,7 @@ OC.L10N.register( "Add storage" : "增加存储", "Advanced settings" : "高级选项", "Delete" : "删除", + "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储" }, "nplurals=1; plural=0;"); diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json index bbdc3beaf01..1c8ae2f0697 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -2,22 +2,32 @@ "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s", "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s", "External storage" : "外部存储", + "Invalid mount point" : "无效的挂载点", + "%s" : "%s", "Personal" : "个人", "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", "Enable encryption" : "启用加密", + "Enable previews" : "启用预览", + "Enable sharing" : "启用分享", "Never" : "从不", "Saved" : "已保存", + "External mount error" : "外部挂载错误", "external-storage" : "外部存储", "Username" : "用户名", "Password" : "密码", "Save" : "保存", "Access key" : "Access key", "Secret key" : "Secret key", + "Builtin" : "内置", "None" : "无", "API key" : "API密匙", + "Username and password" : "用户名和密码", + "RSA public key" : "RSA 公钥", + "Public key" : "公钥", "Amazon S3" : "Amazon S3", + "Hostname" : "主机名", "Port" : "端口", "Region" : "地区", "Enable SSL" : "启用 SSL", @@ -37,11 +47,17 @@ "SFTP" : "SFTP", "Root" : "根路径", "SFTP with secret key login" : "包含secret key的SFTP", + "SMB / CIFS" : "SMB / CIFS", "Share" : "共享", "Domain" : "域名", "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息", "OpenStack Object Storage" : "OpenStack 对象存储", "<b>Note:</b> " : "<b>注意：</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 cURL 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 FTP 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b>“%s”尚未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "No external storage configured" : "未配置外部存储", + "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -53,6 +69,7 @@ "Add storage" : "增加存储", "Advanced settings" : "高级选项", "Delete" : "删除", + "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 70db30c6855..90f4d2274b0 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", + "Not allowed to create a federated share with the same user server" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzerserver ist nicht erlaubt", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", "Storage not valid" : "Speicher ungültig", @@ -38,6 +39,8 @@ OC.L10N.register( "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s gelöscht", "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 6a3f9b353db..834be383d4e 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -1,6 +1,7 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", + "Not allowed to create a federated share with the same user server" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzerserver ist nicht erlaubt", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", "Storage not valid" : "Speicher ungültig", @@ -36,6 +37,8 @@ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s gelöscht", "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", diff --git a/apps/files_sharing/l10n/fil.js b/apps/files_sharing/l10n/fil.js new file mode 100644 index 00000000000..59f17cc001b --- /dev/null +++ b/apps/files_sharing/l10n/fil.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "files_sharing", + { + "Password" : "Password" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fil.json b/apps/files_sharing/l10n/fil.json new file mode 100644 index 00000000000..b60f17590ba --- /dev/null +++ b/apps/files_sharing/l10n/fil.json @@ -0,0 +1,4 @@ +{ "translations": { + "Password" : "Password" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index 4fc50f2ef18..ac36c865c11 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -2,7 +2,7 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", - "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书", + "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", "Couldn't add remote share" : "无法添加远程分享", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", @@ -10,6 +10,7 @@ OC.L10N.register( "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", "Nothing shared yet" : "还没有共享过文件", + "No shared links" : "无分享链接", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -22,6 +23,8 @@ OC.L10N.register( "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", "You received a new remote share from %s" : "您从%s收到了新的远程分享", + "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", + "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", "You shared %1$s via link" : "您通过链接共享了 %1$s", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index ac1852aa347..29cee2c4043 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -1,6 +1,6 @@ { "translations": { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", - "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书", + "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", "Couldn't add remote share" : "无法添加远程分享", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", @@ -8,6 +8,7 @@ "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", "Nothing shared yet" : "还没有共享过文件", + "No shared links" : "无分享链接", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -20,6 +21,8 @@ "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", "You received a new remote share from %s" : "您从%s收到了新的远程分享", + "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", + "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", "You shared %1$s via link" : "您通过链接共享了 %1$s", diff --git a/apps/files_trashbin/l10n/fil.js b/apps/files_trashbin/l10n/fil.js new file mode 100644 index 00000000000..0c880cc3be4 --- /dev/null +++ b/apps/files_trashbin/l10n/fil.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "files_trashbin", + { + "Error" : "Error" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_trashbin/l10n/fil.json b/apps/files_trashbin/l10n/fil.json new file mode 100644 index 00000000000..66c3d76a730 --- /dev/null +++ b/apps/files_trashbin/l10n/fil.json @@ -0,0 +1,4 @@ +{ "translations": { + "Error" : "Error" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index b4111d88e30..a213ea75238 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -191,12 +191,7 @@ class Storage { $mtime = $users_view->filemtime('files/' . $filename); $users_view->copy('files/' . $filename, 'files_versions/' . $filename . '.v' . $mtime); // call getFileInfo to enforce a file cache entry for the new version - $newFileInfo = $users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime); - - // Keep the "encrypted" value of the original file - $oldVersion = $files_view->getFileInfo($filename)->getEncryptedVersion(); - $cache = $newFileInfo->getStorage()->getCache(); - $cache->update($newFileInfo->getId(), ['encrypted' => $oldVersion, 'encryptedVersion' => $oldVersion]); + $users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime); } } @@ -331,15 +326,22 @@ class Storage { //first create a new version $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename); - if ( !$users_view->file_exists($version)) { - + if (!$users_view->file_exists($version)) { $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); - $versionCreated = true; } + $fileToRestore = 'files_versions' . $filename . '.v' . $revision; + + // Restore encrypted version of the old file for the newly restored file + // This has to happen manually here since the file is manually copied below + $oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion(); + $newFileInfo = $files_view->getFileInfo($filename); + $cache = $newFileInfo->getStorage()->getCache(); + $cache->update($newFileInfo->getId(), ['encrypted' => $oldVersion, 'encryptedVersion' => $oldVersion]); + // rollback - if (self::copyFileContents($users_view, 'files_versions' . $filename . '.v' . $revision, 'files' . $filename)) { + if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) { $files_view->touch($file, $revision); Storage::scheduleExpire($uid, $file); \OC_Hook::emit('\OCP\Versions', 'rollback', array( diff --git a/apps/user_ldap/l10n/fil.js b/apps/user_ldap/l10n/fil.js index 95c97db2f9c..db848ae4c2c 100644 --- a/apps/user_ldap/l10n/fil.js +++ b/apps/user_ldap/l10n/fil.js @@ -1,7 +1,6 @@ OC.L10N.register( "user_ldap", { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] + "Password" : "Password" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/user_ldap/l10n/fil.json b/apps/user_ldap/l10n/fil.json index 8e0cd6f6783..b60f17590ba 100644 --- a/apps/user_ldap/l10n/fil.json +++ b/apps/user_ldap/l10n/fil.json @@ -1,5 +1,4 @@ { "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] + "Password" : "Password" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file |