Merge branch 'master' of git://github.com/owncloud/core

10 files changed, 65 insertions, 7 deletions

diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 69fdc06a293..790ab423e38 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -45,6 +45,7 @@
 "delete" => "smazat",
 "share" => "sdílet",
 "Password protected" => "Chráněno heslem",
+"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
 "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
 "ownCloud password reset" => "Obnovení hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 0a87fc4e8e7..fddb6859912 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -22,7 +22,7 @@
 "Ok" => "OK",
 "No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
+"Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
 "Shared with you and the group %s by %s" => "%s hat dies für dich und die Gruppe %s freigegeben.",
@@ -44,15 +44,16 @@
 "update" => "aktualisieren",
 "delete" => "löschen",
 "share" => "teilen",
-"Password protected" => "Passwort geschützt",
+"Password protected" => "Durch ein Passwort geschützt",
+"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
-"Request reset" => "Anfrage zurückgesetzt",
+"Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
@@ -67,10 +68,10 @@
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Advanced" => "Erweitert",
+"Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
-"will be used" => "wird genutzt",
+"will be used" => "wird verwendet",
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
@@ -82,7 +83,7 @@
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"You are logged out." => "Sie wurden abgemeldet.",
+"You are logged out." => "Du wurdest abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter"
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index d6fbb7693df..1a2d17c69d0 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -45,6 +45,7 @@
 "delete" => "supprimer",
 "share" => "partager",
 "Password protected" => "Protégé par un mot de passe",
+"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
 "Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index cce4ac44cdc..669c6b6e44a 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -45,6 +45,7 @@
 "delete" => "eliminare",
 "share" => "condividere",
 "Password protected" => "Protetta da password",
+"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
 "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index e563c09cf15..bd442ef4116 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -45,6 +45,7 @@
 "delete" => "削除",
 "share" => "共有",
 "Password protected" => "パスワード保護",
+"Error unsetting expiration date" => "有効期限の未設定エラー",
 "Error setting expiration date" => "有効期限の設定でエラー発生",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 21ae28be1e7..cd7064e89c3 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -45,6 +45,7 @@
 "delete" => "remover",
 "share" => "compartilhar",
 "Password protected" => "Protegido com senha",
+"Error unsetting expiration date" => "Erro ao remover data de expiração",
 "Error setting expiration date" => "Erro ao definir data de expiração",
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 8647cc11901..4083113a653 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -15,13 +15,38 @@
 "October" => "Octombrie",
 "November" => "Noiembrie",
 "December" => "Decembrie",
+"Choose" => "Alege",
 "Cancel" => "Anulare",
 "No" => "Nu",
 "Yes" => "Da",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.",
 "Error" => "Eroare",
+"Error while sharing" => "Eroare la partajare",
+"Error while unsharing" => "Eroare la anularea partajării",
+"Error while changing permissions" => "Eroare la modificarea permisiunilor",
+"Shared with you and the group %s by %s" => "Partajat cu tine și grupul %s de %s",
+"Shared with you by %s" => "Partajat cu tine de %s",
+"Share with" => "Partajat cu",
+"Share with link" => "Partajare cu legătură",
+"Password protect" => "Protejare cu parolă",
 "Password" => "Parola",
+"Set expiration date" => "Specifică data expirării",
+"Expiration date" => "Data expirării",
+"Share via email: %s" => "Partajare prin email: %s",
+"No people found" => "Nici o persoană găsită",
+"Resharing is not allowed" => "Repartajarea nu este permisă",
+"Shared in %s with %s" => "Partajat în %s cu %s",
+"Unshare" => "Anulare partajare",
+"can edit" => "poate edita",
+"access control" => "control acces",
+"create" => "creare",
+"update" => "actualizare",
+"delete" => "ștergere",
+"share" => "partajare",
+"Password protected" => "Protejare cu parolă",
+"Error unsetting expiration date" => "Eroare la anularea datei de expirare",
+"Error setting expiration date" => "Eroare la specificarea datei de expirare",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 2669d4d5b32..993aae71ac3 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -45,6 +45,7 @@
 "delete" => "radera",
 "share" => "dela",
 "Password protected" => "Lösenordsskyddad",
+"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
 "Error setting expiration date" => "Fel vid sättning av utgångsdatum",
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index ce8b97ae529..65b14b121d5 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -45,6 +45,7 @@
 "delete" => "ลบ",
 "share" => "แชร์",
 "Password protected" => "ใส่รหัสผ่านไว้",
+"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
 "Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index b84519a5c06..47bda01ab54 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -15,13 +15,38 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"Choose" => "选择(&C)...",
 "Cancel" => "取消",
 "No" => "否",
 "Yes" => "是",
 "Ok" => "好",
 "No categories selected for deletion." => "没有选择要删除的类别",
 "Error" => "错误",
+"Error while sharing" => "共享时出错",
+"Error while unsharing" => "取消共享时出错",
+"Error while changing permissions" => "修改权限时出错",
+"Shared with you and the group %s by %s" => "与你及%s组共享，共享人: %s",
+"Shared with you by %s" => "共享人: %s",
+"Share with" => "共享",
+"Share with link" => "共享链接",
+"Password protect" => "密码保护",
 "Password" => "密码",
+"Set expiration date" => "设置过期日期",
+"Expiration date" => "过期日期",
+"Share via email: %s" => "发电子邮件分享: %s",
+"No people found" => "未找到此人",
+"Resharing is not allowed" => "不允许二次共享",
+"Shared in %s with %s" => "在%s中与%s共享",
+"Unshare" => "取消共享",
+"can edit" => "可以修改",
+"access control" => "访问控制",
+"create" => "创建",
+"update" => "更新",
+"delete" => "删除",
+"share" => "共享",
+"Password protected" => "密码已受保护",
+"Error unsetting expiration date" => "取消设置过期日期时出错",
+"Error setting expiration date" => "设置过期日期时出错",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",