diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 0c717258fe6864ca32bc3751496bebbd42c45017..866d8a366faa528e228f613c4fd79b8f9d54c30c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -82,7 +82,7 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Non ten permisos para enviar ou crear ficheiros aquí.",
"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
"Download" => "Descargar",
-"Upload too large" => "Envío demasiado grande",
+"Upload too large" => "Envío grande de máis",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
"Currently scanning" => "Análise actual"
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
index 8a7683dee20bc7a6e5f0528660a21a93f6b49e0b..fe1a9aeb86404711339cb43ff4fbcab81e65e918 100644
--- a/apps/files/l10n/ja.php
+++ b/apps/files/l10n/ja.php
@@ -5,7 +5,7 @@ $TRANSLATIONS = array(
"File name cannot be empty." => "ファイル名を空にすることはできません。",
"\"%s\" is an invalid file name." => "\"%s\" は無効なファイル名です。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
-"The target folder has been moved or deleted." => "目標のフォルダは移動されたか、削除されました。",
+"The target folder has been moved or deleted." => "対象のフォルダーは移動されたか、削除されました。",
"The name %s is already used in the folder %s. Please choose a different name." => "%s はフォルダー %s ですでに使われています。別の名前を選択してください。",
"Not a valid source" => "有効なソースではありません",
"Server is not allowed to open URLs, please check the server configuration" => "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
@@ -84,6 +84,7 @@ $TRANSLATIONS = array(
"Download" => "ダウンロード",
"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
-"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。"
+"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
+"Currently scanning" => "現在スキャン中"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index fa1d4c3da4029ab3150934cd48dca0dae899751b..81de8419c20265debac6e45a6ca34aef691bf5e3 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+"Unknown error. Please check your system settings or contact your administrator" => "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
"Missing requirements." => "必要要件が満たされていません。",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 248afb5f6a7a8723629ecfe1bee5929160be25ff..e143fd3a8815bf99a09d09e68a9bfd42dd506324 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -64,7 +64,7 @@ $TRANSLATIONS = array(
"Delete" => "Eliminar",
"Enable User External Storage" => "Activar o almacenamento externo do usuario",
"Allow users to mount the following external storage" => "Permitirlle aos usuarios montar o seguinte almacenamento externo",
-"SSL root certificates" => "Certificados SSL root",
-"Import Root Certificate" => "Importar o certificado root"
+"SSL root certificates" => "Certificados raíz SSL",
+"Import Root Certificate" => "Importar o certificado raíz"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
index b70dd2a09a45678ad49260caeab20ab87fa79a2e..6dce541abaf3dadd225816b51df1e4d9f49ad706 100644
--- a/apps/files_external/l10n/ja.php
+++ b/apps/files_external/l10n/ja.php
@@ -38,7 +38,7 @@ $TRANSLATIONS = array(
"Username as share" => "共有名",
"URL" => "URL",
"Secure https://" => "セキュア https://",
-"Remote subfolder" => "リモートサブフォルダ",
+"Remote subfolder" => "リモートサブフォルダー",
"Access granted" => "アクセスは許可されました",
"Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
"Grant access" => "アクセスを許可",
@@ -63,7 +63,7 @@ $TRANSLATIONS = array(
"Users" => "ユーザー",
"Delete" => "削除",
"Enable User External Storage" => "ユーザーの外部ストレージを有効にする",
-"Allow users to mount the following external storage" => "ユーザに以下の外部ストレージのマウントを許可する",
+"Allow users to mount the following external storage" => "ユーザーに以下の外部ストレージのマウントを許可する",
"SSL root certificates" => "SSLルート証明書",
"Import Root Certificate" => "ルート証明書をインポート"
);
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index 1ea542795237a28a1c1c9ff4899b5d62ad46030e..112f6de9e3dce505650bc1658494d668939a5cd5 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -1,5 +1,9 @@
<?php
$TRANSLATIONS = array(
+"Shared with you" => "Compartío contigo",
+"Shared with others" => "Compartío con otros",
+"No files have been shared with you yet." => "Entá nun se compartieron ficheros contigo.",
+"You haven't shared any files yet." => "Entá nun compartiesti dengún ficheru.",
"Shared by {owner}" => "Compartíu por {owner}",
"Shared by" => "Compartíu por",
"This share is password-protected" => "Esta compartición tien contraseña protexida",
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index d47a29d5790c036890e09dfe70b4beff0f806083..dde53b44ac54308dad9ff042239aa44f2bd5fa97 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Du hast bis jetzt keine Dateien mit anderen geteilt.",
"Shared by {owner}" => "Geteilt von {owner}",
"Shared by" => "Geteilt von ",
-"link" => "Link",
"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." => "Bitte überprüfe Dein Passwort und versuche es erneut.",
"Password" => "Passwort",
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index b702ce1bec42039e6c24b54ce4c04f2b9284fadc..7b86917a7a061dd1fdd8bd296e77d9dbaa1bea38 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Sie haben bis jetzt keine Dateien mit anderen geteilt.",
"Shared by {owner}" => "Geteilt von {owner}",
"Shared by" => "Geteilt von",
-"link" => "Link",
"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" => "Passwort",
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index abc23d460d46db728f5c68a12f22680bdb001cd7..ee95d3e255e06033ea419a161d2833d90c0d61b0 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.",
"Shared by {owner}" => "Διαμοιράστηκε από τον {owner}",
"Shared by" => "Διαμοιράστηκε από",
-"link" => "σύνδεσμος",
"This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
"The password is wrong. Try again." => "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
"Password" => "Κωδικός πρόσβασης",
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
index 966c6a5e814831a14e17ba68ef89b6f9a1792c13..96f4e34893ba381fd8533095b5e406407580654b 100644
--- a/apps/files_sharing/l10n/en_GB.php
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "You haven't shared any files yet.",
"Shared by {owner}" => "Shared by {owner}",
"Shared by" => "Shared by",
-"link" => "link",
"This share is password-protected" => "This share is password-protected",
"The password is wrong. Try again." => "The password is wrong. Try again.",
"Password" => "Password",
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index aecbe010ae362a14c7a4129932b84329b6cb2608..dbe2a5fce8324b541e2f0c12ea95a59f8c7c7953 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Aún no has compartido ningún archivo.",
"Shared by {owner}" => "Compartido por {owner}",
"Shared by" => "Compartido por",
-"link" => "enlace",
"This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 1a79a2eb0a870ee5ace43f952723a4f2981d1407..6c9b3e61476dface5d4a21eaedb41fa4a38bb2c4 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Et ole jakanut yhtäkään tiedostoa vielä.",
"Shared by {owner}" => "Jakanut {owner}",
"Shared by" => "Jakanut",
-"link" => "linkki",
"This share is password-protected" => "Tämä jako on suojattu salasanalla",
"The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
"Password" => "Salasana",
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 60fd05b24013814cd31c56df17c40ddcc50aa97d..1a661225584b246924b280a3c55460c884757459 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant",
"Shared by {owner}" => "Partagé par {owner}",
"Shared by" => "Partagé par",
-"link" => "lien",
"This share is password-protected" => "Ce partage est protégé par un mot de passe",
"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
"Password" => "Mot de passe",
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 3ebb8ccb93231a97e68a06fde8ad960991b7b0b9..aaebe2c0b7e386c36eafb951403bd2b0724afe2f 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Aínda non compartiu ningún ficheiro.",
"Shared by {owner}" => "Compartido por {owner}",
"Shared by" => "Compartido por",
-"link" => "ligazón",
"This share is password-protected" => "Esta compartición está protexida con contrasinal",
"The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
"Password" => "Contrasinal",
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 30d37b828484da53389e84dabb8d2fc43abf9da1..f69b4d4468c064631f05b9e4a3d5cbb58fe84050 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Shared with you" => "Condiviso con te",
+"Shared with others" => "Condiviso con altri",
+"No files have been shared with you yet." => "Non è stato ancora condiviso alcun file con te.",
+"You haven't shared any files yet." => "Non hai ancora condiviso alcun file.",
"Shared by {owner}" => "Condiviso da {owner}",
"Shared by" => "Condiviso da",
"This share is password-protected" => "Questa condivione è protetta da password",
"The password is wrong. Try again." => "La password è errata. Prova ancora.",
"Password" => "Password",
"Name" => "Nome",
+"Share time" => "Tempo di condivisione",
"Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.",
"Reasons might be:" => "I motivi potrebbero essere:",
"the item was removed" => "l'elemento è stato rimosso",
diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php
index 8bdca1ef24998a02cfbcb5b02ee043e264de9c5d..0478202014ee6c260689c0eac201da4d871ddd39 100644
--- a/apps/files_sharing/l10n/ja.php
+++ b/apps/files_sharing/l10n/ja.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "まだ共有を行なっているファイルはありません。",
"Shared by {owner}" => "{owner} と共有中",
"Shared by" => "共有者：",
-"link" => "リンク",
"This share is password-protected" => "この共有はパスワードで保護されています",
"The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
"Password" => "パスワード",
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index b2d5b8d65bef71ae13a23546c85621d4cde518aa..3a30d8166b44c3e89516b3e5a5b580781b6c4dfc 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Du har ikke delt noen filer ennå.",
"Shared by {owner}" => "Delt av {owner}",
"Shared by" => "Delt av",
-"link" => "lenke",
"This share is password-protected" => "Denne delingen er passordbeskyttet",
"The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
"Password" => "Passord",
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index ea691e332707577872cab78dc0ce34f67c676b40..e319170fa9f573df1a8d6ae451e9d9c7c117e326 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Nie współdzielisz jeszcze żadnych plików.",
"Shared by {owner}" => "Udostępnione przez {owner}",
"Shared by" => "Udostępniane przez",
-"link" => "link",
"This share is password-protected" => "Udział ten jest chroniony hasłem",
"The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.",
"Password" => "Hasło",
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index eae8c6d720b5aec6f15420acf86617678390ddb7..7dd503a5b9d5813e64b35b5c1d2831dd8d747378 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Você ainda não compartilhou nenhum arquivo.",
"Shared by {owner}" => "Compartilhado por {owner}",
"Shared by" => "Compartilhada por",
-"link" => "link",
"This share is password-protected" => "Este compartilhamento esta protegido por senha",
"The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
"Password" => "Senha",
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 561119dca963257203fd613b427c06365753197b..03c57847d854757ba93f20699e72f56d1a93be3b 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -4,7 +4,6 @@ $TRANSLATIONS = array(
"Shared with others" => "Partilhado com outros",
"Shared by {owner}" => "Partilhado por {owner}",
"Shared by" => "Partilhado por",
-"link" => "ligação",
"This share is password-protected" => "Esta partilha está protegida por palavra-chave",
"The password is wrong. Try again." => "Password errada, por favor tente de novo",
"Password" => "Palavra-passe",
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index abf7780c2429d706c000ed1ff62fcd9795de92cc..e5fbd7a90af9d0ab25c361b4a2df2dfd7fa25400 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Du har inte delat några filer ännu.",
"Shared by {owner}" => "Delad av {owner}",
"Shared by" => "Delad av",
-"link" => "länk",
"This share is password-protected" => "Den här delningen är lösenordsskyddad",
"The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
"Password" => "Lösenord",
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index d32cd07d0c56d663224ca42d30a8afe41ade8bcb..061d2bb7b2e4ddc928fde5aa07b72f03e56713f1 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"You haven't shared any files yet." => "Henüz hiçbir dosya paylaşmadınız.",
"Shared by {owner}" => "{owner} tarafından paylaşılmış",
"Shared by" => "Paylaşan",
-"link" => "bağlantı",
"This share is password-protected" => "Bu paylaşım parola korumalı",
"The password is wrong. Try again." => "Parola hatalı. Yeniden deneyin.",
"Password" => "Parola",
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index 620454a9561e1c296646f101ee6317bbbca29918..bdb11a457e85a6db85615782de7cf4caa8b000d3 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"Select attributes" => "Esbillar atributos",
"Connection test succeeded" => "Test de conexón esitosu",
"Connection test failed" => "Falló'l test de conexón",
+"Confirm Deletion" => "Confirmar desaniciu",
"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index a9f554535d1ac9f58cf3d5d4b01a8cceff7ff959..26562b91c67e5a9122a8984ca7fd7b0d63fa13cb 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Löschen fehlgeschlagen",
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
+"{nthServer}. Server" => "{nthServer}. - Server",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolgreich",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 4d3f01af42b16ce8fec054b39eda13bfa573cdef..4e859e853cd773fd322a0cc5314eb2d1c74ecfc0 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Löschen fehlgeschlagen",
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
+"{nthServer}. Server" => "{nthServer}. - Server",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolg",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index f558fa78977510bba6954c7da46095155a1f678b..2fedc2a9460d13d8c70fa0098af2dec2ba4701a0 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Failed to delete the server configuration" => "Palvelinmäärityksen poistaminen epäonnistui",
"The configuration is valid and the connection could be established!" => "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
"Deletion failed" => "Poisto epäonnistui",
+"Take over settings from recent server configuration?" => "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
"Success" => "Onnistui!",
@@ -42,6 +43,7 @@ $TRANSLATIONS = array(
"Back" => "Takaisin",
"Continue" => "Jatka",
"Advanced" => "Lisäasetukset",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
"Connection Settings" => "Yhteysasetukset",
"Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti",
"Disable Main Server" => "Poista pääpalvelin käytöstä",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index aacd17b72b5045451df1b1a19a1795a5dbff8b87..6906ea5e751f3f43c52fbe1dba8c4f6a3a03e1ba 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Produciuse un fallo ao eliminar",
"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
"Keep settings?" => "Manter os axustes?",
+"{nthServer}. Server" => "{nthServer}. Servidor",
"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
"mappings cleared" => "limpadas as asignacións",
"Success" => "Correcto",
@@ -119,7 +120,7 @@ $TRANSLATIONS = array(
"UUID Attribute for Users:" => "Atributo do UUID para usuarios:",
"UUID Attribute for Groups:" => "Atributo do UUID para grupos:",
"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Os nomes de usuario empréganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»"
);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index fea2d66fa6f2b0ad6212334f301c7d2b9f800f9c..8750c8d7f69a18be01f364c44da69e94f0480ad0 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Eliminazione non riuscita",
"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
"Keep settings?" => "Vuoi mantenere le impostazioni?",
+"{nthServer}. Server" => "{nthServer}. server",
"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
"mappings cleared" => "associazioni cancellate",
"Success" => "Riuscito",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
index eb85c055eff0ccd130a2570fc2b4449d56397534..135ffece2db333077442049edcf15803f559463c 100644
--- a/apps/user_ldap/l10n/ja.php
+++ b/apps/user_ldap/l10n/ja.php
@@ -12,10 +12,12 @@ $TRANSLATIONS = array(
"Deletion failed" => "削除に失敗しました",
"Take over settings from recent server configuration?" => "最近のサーバー設定から設定を引き継ぎますか？",
"Keep settings?" => "設定を保持しますか？",
+"{nthServer}. Server" => "{nthServer}. サーバー",
"Cannot add server configuration" => "サーバー設定を追加できません",
"mappings cleared" => "マッピングをクリアしました",
"Success" => "成功",
"Error" => "エラー",
+"Please specify the port" => "ポートを指定してください",
"Configuration OK" => "設定OK",
"Configuration incorrect" => "設定に誤りがあります",
"Configuration incomplete" => "設定が不完全です",
@@ -30,6 +32,9 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s ユーザーが見つかりました"),
"Invalid Host" => "無効なホスト",
"Could not find the desired feature" => "望ましい機能は見つかりませんでした",
+"Server" => "サーバー",
+"User Filter" => "ユーザーフィルター",
+"Login Filter" => "ログインフィルター",
"Group Filter" => "グループフィルタ",
"Save" => "保存",
"Test Configuration" => "設定をテスト",
@@ -43,10 +48,12 @@ $TRANSLATIONS = array(
"groups found" => "グループが見つかりました",
"Users login with this attribute:" => "この属性でユーザーログイン:",
"LDAP Username:" => "LDAP ユーザー名:",
-"LDAP Email Address:" => "LDAP メールアドレス:",
+"LDAP Email Address:" => "LDAPメールアドレス:",
"Other Attributes:" => "他の属性:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
+"1. Server" => "1. Server",
"Add Server Configuration" => "サーバー設定を追加",
+"Delete Configuration" => "設定を削除",
"Host" => "ホスト",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
"Port" => "ポート",
@@ -56,7 +63,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
"One Base DN per line" => "1行に1つのベースDN",
"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザーとグループのベースDNを指定することができます。",
-"Limit %s access to users meeting these criteria:" => "この基準を満たすユーザに対し %s へのアクセスを制限:",
+"Limit %s access to users meeting these criteria:" => "この基準を満たすユーザーに対し %s へのアクセスを制限:",
"The filter specifies which LDAP users shall have access to the %s instance." => "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" => "ユーザーが見つかりました",
"Back" => "戻る",
@@ -72,7 +79,7 @@ $TRANSLATIONS = array(
"Backup (Replica) Port" => "バックアップ（レプリカ）ポート",
"Disable Main Server" => "メインサーバーを無効にする",
"Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
-"Case insensitive LDAP server (Windows)" => "大文字と小文字を区別しない LDAP サーバ (Windows)",
+"Case insensitive LDAP server (Windows)" => "大文字と小文字を区別しないLDAPサーバー (Windows)",
"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
"Cache Time-To-Live" => "キャッシュのTTL",
@@ -85,7 +92,7 @@ $TRANSLATIONS = array(
"User Search Attributes" => "ユーザー検索属性",
"Optional; one attribute per line" => "オプション：1行に1属性",
"Group Display Name Field" => "グループ表示名のフィールド",
-"The LDAP attribute to use to generate the groups's display name." => "ユーザのグループ表示名の生成に利用するLDAP属性",
+"The LDAP attribute to use to generate the groups's display name." => "ユーザーのグループ表示名の生成に利用するLDAP属性",
"Base Group Tree" => "ベースグループツリー",
"One Group Base DN per line" => "1行に1つのグループベースDN",
"Group Search Attributes" => "グループ検索属性",
@@ -106,7 +113,7 @@ $TRANSLATIONS = array(
"Internal Username Attribute:" => "内部ユーザー名属性:",
"Override UUID detection" => "UUID検出を再定義する",
"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
-"UUID Attribute for Users:" => "ユーザーの UUID 属性:",
+"UUID Attribute for Users:" => "ユーザーのUUID属性:",
"UUID Attribute for Groups:" => "グループの UUID 属性:",
"Username-LDAP User Mapping" => "ユーザー名とLDAPユーザのマッピング",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index c70947f54796c42468d1b3df6fe2f8f57cd14c7a..e5d855751ccad4cf7700274ba9107985a7319a68 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Silme başarısız oldu",
"Take over settings from recent server configuration?" => "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
"Keep settings?" => "Ayarlar korunsun mu?",
+"{nthServer}. Server" => "{nthServer}. Sunucu",
"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
"mappings cleared" => "eşleştirmeler temizlendi",
"Success" => "Başarılı",
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index bdb335fadb49ff864f69e91ef89ad3f5e7ac1b5c..fd26e9acd18ee37dfdc34a668920a28e107e80fe 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "تأكد شخصية ال WebDAV"
+"WebDAV Authentication" => "تأكد شخصية ال WebDAV",
+"Save" => "حفظ"
);
$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/user_webdavauth/l10n/ast.php b/apps/user_webdavauth/l10n/ast.php
index dba7bcd08dc286b1538518193111f4e0b2fd5ed1..7f87e130a9afbcc5986bdc23ec39eea3ada0c018 100644
--- a/apps/user_webdavauth/l10n/ast.php
+++ b/apps/user_webdavauth/l10n/ast.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación per aciu de WevDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
index 14e6b280fd21b20606a1a1c034888a61553eb6ce..639bc9ebf6ddb315498f53962b6f1e4b7c08870f 100644
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV идентификация"
+"WebDAV Authentication" => "WebDAV идентификация",
+"Save" => "Запис"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bn_BD.php b/apps/user_webdavauth/l10n/bn_BD.php
index 5366552efae004346a719cbb5d66ba2d839058b6..354df7c32d975d948bf802f82e85dda06d14aa56 100644
--- a/apps/user_webdavauth/l10n/bn_BD.php
+++ b/apps/user_webdavauth/l10n/bn_BD.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
-"URL: http://" => "URL:http://"
+<?php
+$TRANSLATIONS = array(
+"Save" => "সংরক্ষণ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bs.php b/apps/user_webdavauth/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..2624f90daa8e1f581ca64eb4c40f296c320ae31c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bs.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Spasi"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 7684db856307a00fa94680619d5f81a7cbd7e90f..ed64e5896a8993c057f1fb5dbfaf97c24ca7f8b7 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticació WebDAV",
+"Save" => "Desa",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index 94ebf5c396cb086ca575d32ff867f9cd4dbf31f1..bbc118d840430231ea0df017ac9b559005fa8eed 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Ověření WebDAV",
+"Save" => "Uložit",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/cy_GB.php b/apps/user_webdavauth/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..765f844a90c6ef068dfcecf5126d8a63e1e977bb
--- /dev/null
+++ b/apps/user_webdavauth/l10n/cy_GB.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Cadw"
+);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 66b74d389ba1d14ca12f50e149f1e3d0351e3bf5..219cac8b69954546bbaf34eef69a1a3c24058e58 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-godkendelse",
+"Save" => "Gem",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index bd856046b2b6399d5bc2923a67996e700f9d6ebc..86b2da8d9efda6242584118916230cb28f0fb4bb 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Authentifikation",
+"Address:" => "Adresse:",
+"Save" => "Speichern",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_AT.php b/apps/user_webdavauth/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..60e8abdbf26425e23592c6bcd1ea1069b5db9f8f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_AT.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Speichern"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_CH.php b/apps/user_webdavauth/l10n/de_CH.php
index 3215c9d28ccfd32f2b22055ede04e37603c10567..1683c56e4da7ee95b7844c1b4f0be8768e2b8fbf 100644
--- a/apps/user_webdavauth/l10n/de_CH.php
+++ b/apps/user_webdavauth/l10n/de_CH.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-Authentifizierung",
+"Save" => "Speichern",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 3215c9d28ccfd32f2b22055ede04e37603c10567..5888529624dd912262a0f041ec3dee06b9097b0d 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-Authentifizierung",
+"Address:" => "Adresse:",
+"Save" => "Speichern",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 993d6e2389690adb5a308fb3c7181b082b1c096d..0a9be9f8559eaea91a62b25ffa32382b0d00174e 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Πιστοποίηση μέσω WebDAV ",
+"Save" => "Αποθήκευση",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/en_GB.php b/apps/user_webdavauth/l10n/en_GB.php
index ea05dc0a0e0fc05a231592e03a5ad8e6a7faeea5..345c0c2899890b64f0d1b335f389ec18cb452101 100644
--- a/apps/user_webdavauth/l10n/en_GB.php
+++ b/apps/user_webdavauth/l10n/en_GB.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Authentication",
+"Save" => "Save",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index ddcac32ca1b4b3de6abc20063d5ee77c0739fcbf..b5d824fdc996337a0ec32121ed8617db17b62163 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-aŭtentigo"
+"WebDAV Authentication" => "WebDAV-aŭtentigo",
+"Save" => "Konservi"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 19a92fb233a8077faf32e781376e6426996fab67..360724f89862ee56adf95f8e142596130178d1ca 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación mediante WevDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index f0fc97b1a46b7bf10d52f2d5d35c8cdf7b512b5b..38164f9fba41194c72b58f0efd0f16fd12f21bf6 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación de WebDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_MX.php b/apps/user_webdavauth/l10n/es_MX.php
index 19a92fb233a8077faf32e781376e6426996fab67..360724f89862ee56adf95f8e142596130178d1ca 100644
--- a/apps/user_webdavauth/l10n/es_MX.php
+++ b/apps/user_webdavauth/l10n/es_MX.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación mediante WevDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index 4f34761e6093dba14bf4fd705db68b5ca3797102..961375692d94f119ef8ad656dd08c9daa5a0174f 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV autentimine",
+"Save" => "Salvesta",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index d1ef3c4e99c67cc6ea01879d9c6a66a0f599d891..8a083701ce6837497b49dfabffc60e92588fba80 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Autentikazioa",
+"Save" => "Gorde",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu_ES.php b/apps/user_webdavauth/l10n/eu_ES.php
new file mode 100644
index 0000000000000000000000000000000000000000..a1d57a93b5265d0830f56a91aefba574106b1303
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu_ES.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Gorde"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fa.php b/apps/user_webdavauth/l10n/fa.php
index ad061226d43f20b9bdf3f80d6c5947f4cc629a69..0bf8b6f67331d1f1cbbc9d7123e830bf9e4e7124 100644
--- a/apps/user_webdavauth/l10n/fa.php
+++ b/apps/user_webdavauth/l10n/fa.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "اعتبار سنجی WebDAV "
+"WebDAV Authentication" => "اعتبار سنجی WebDAV ",
+"Save" => "ذخیره"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
index 4ebf870822f31c7e85d89561f0d225b2c5f49a35..7209a889f1b274bb296eea6e1da2191b65b867c5 100644
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ b/apps/user_webdavauth/l10n/fi_FI.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-todennus",
+"Address:" => "Osoite:",
+"Save" => "Tallenna",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index cc6dd6a6692a1e5a4fda4e6840f785b1cb4ea7a7..2f838a503b3d40369a4616ddbc263cb5e27b0751 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Authentification WebDAV",
+"Save" => "Sauvegarder",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index 29635cffa21a923f9b19070b4a24fd53d8d28b55..93ea1773cb1549e57f5e0892849ea77daa713677 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación WebDAV",
+"Address:" => "Enderezo:",
+"Save" => "Gardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
index d11fce81a365b3441c7df3ee368beeef0d58ce18..4b037cc537f3ac6fcdf4836e25b151d79fc35f1f 100644
--- a/apps/user_webdavauth/l10n/he.php
+++ b/apps/user_webdavauth/l10n/he.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "הזדהות מול WebDAV"
+"WebDAV Authentication" => "הזדהות מול WebDAV",
+"Save" => "שמירה"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hi.php b/apps/user_webdavauth/l10n/hi.php
new file mode 100644
index 0000000000000000000000000000000000000000..d373ff080cbfec8c9577dc40c36c0fbcc33a886c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hi.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "सहेजें"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hr.php b/apps/user_webdavauth/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..5df22b34400a8f21df0af1a7e675a9ff5e29ba5b
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hr.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Snimi"
+);
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index cd77eadaa1fe1c9263ed64625f37c85a40ea9cdd..97bab9a583fbc6a81c53b4503413d550401c2d87 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV hitelesítés",
+"Save" => "Mentés",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hy.php b/apps/user_webdavauth/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..3f79bc37ffa2dd86577d8a42e383e964640fe9b3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hy.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Պահպանել"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ia.php b/apps/user_webdavauth/l10n/ia.php
new file mode 100644
index 0000000000000000000000000000000000000000..413d8990659ad044bf9ada09ad0e5cfe35f7e0d9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ia.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Salveguardar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 1e4ed72bd99ed623d00db5378648d601b057db02..25d5d6cac02629d33028f439fa74fa3149f8e417 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Otentikasi WebDAV",
+"Save" => "Simpan",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index 4fcab07654249eba79049bbe043ed7b5708ab51a..c583862c31138583eb723c01766aa62bc8536fc7 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Auðkenni"
+"WebDAV Authentication" => "WebDAV Auðkenni",
+"Save" => "Vista"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index 044aac46bf566f2df5cd75a8f3ca4391d658cc31..f068209d3fc3a8b569fcc19ae47cabda1b80ea08 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticazione WebDAV",
+"Address:" => "Indirizzo:",
+"Save" => "Salva",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ja.php b/apps/user_webdavauth/l10n/ja.php
index c45e63c7809913888805f23443106b78fc42309e..74c66e85312d9702a22bb1d6a75779b46239d263 100644
--- a/apps/user_webdavauth/l10n/ja.php
+++ b/apps/user_webdavauth/l10n/ja.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 認証",
-"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ユーザーの権限情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
+"Save" => "保存",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
index c2aa956072cecb3a46980fd7d4ec466207fc9910..e5deb0ea67d39f4a151a40f0855e264bcfee4c30 100644
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია"
+"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია",
+"Save" => "შენახვა"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/km.php b/apps/user_webdavauth/l10n/km.php
index dce8e5e9bb77a5ba7d84fd17289f1adf26a61d4c..eee76d0821461ec741a81964e38f8978463d946a 100644
--- a/apps/user_webdavauth/l10n/km.php
+++ b/apps/user_webdavauth/l10n/km.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ WebDAV",
+"Save" => "រក្សាទុក",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "អត្តសញ្ញាណអ្នកប្រើនឹងត្រូវផ្ញើទៅអាសយដ្ឋាននេះ។ កម្មវិធីបន្ថែមនេះពិនិត្យចម្លើយតប ហើយនឹងបកស្រាយកូដស្ថានភាព HTTP ដូចជា 401 និង 403 ថាជាអត្តសញ្ញាណមិនត្រឹមត្រូវ ហើយនិងចម្លើយតបផ្សេងៗថាត្រឹមត្រូវ។"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index e586e759f929b8f22eca470e9110570ef4d76a5c..68a113025b27eece68571b7202807f3189ef0e3f 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 인증",
+"Save" => "저장",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ku_IQ.php b/apps/user_webdavauth/l10n/ku_IQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e2be8ad0d68bd262364071885f7dde698d96b20
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ku_IQ.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "پاشکهوتکردن"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lb.php b/apps/user_webdavauth/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..053c7e747d50837580efb98bcfc24fd25926f30f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lb.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Späicheren"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index 02ed14dba7d46581eb402422e6a2e05e39a11f60..29e0b7821d66d633c6b547bb81c930c0b2f69c96 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV autentikacija",
+"Save" => "Išsaugoti",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/lv.php b/apps/user_webdavauth/l10n/lv.php
index 7ce96285881b8ad4c28d2de7740958bfdd89fd3c..a55bb24ee8d10e0c7fd32ade1bce876201a78e65 100644
--- a/apps/user_webdavauth/l10n/lv.php
+++ b/apps/user_webdavauth/l10n/lv.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autentifikācija"
+"WebDAV Authentication" => "WebDAV autentifikācija",
+"Save" => "Saglabāt"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/mk.php b/apps/user_webdavauth/l10n/mk.php
index 6ebe36423b243817d82f8e376c24bc362af5255b..2146b81745252fa8735b02ff2542e2114b4b86bd 100644
--- a/apps/user_webdavauth/l10n/mk.php
+++ b/apps/user_webdavauth/l10n/mk.php
@@ -1,5 +1,5 @@
<?php
$TRANSLATIONS = array(
-"Address: " => "Адреса:"
+"Save" => "Сними"
);
$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_webdavauth/l10n/ms_MY.php b/apps/user_webdavauth/l10n/ms_MY.php
index c157045e5857923da95f5910c6aa199872c3a3db..5142c1d0f4a993ecf4df7956193788e86e58be24 100644
--- a/apps/user_webdavauth/l10n/ms_MY.php
+++ b/apps/user_webdavauth/l10n/ms_MY.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Pengesahan ",
+"Save" => "Simpan",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Butiran pengguna akan dihantar ke alamat ini. Plugin ini memeriksa maklum balas dan akan mentafsir kod status HTTP 401 dan 403 sebagai butiran tidak sah, dan semua maklum balas lain sebagai butiran yang sah."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/nb_NO.php b/apps/user_webdavauth/l10n/nb_NO.php
index 4029a62c1474f87daf3652a1f502d4f32a48f824..624ff1969bcf7eb7d32eac259416b4e810d1f36d 100644
--- a/apps/user_webdavauth/l10n/nb_NO.php
+++ b/apps/user_webdavauth/l10n/nb_NO.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-autentisering",
+"Save" => "Lagre",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index badbbe064037af8c2d11b4b658b3ffa8a8ffec39..d8e8b6f3f249127b4620982e1f24aa7aa51c8dc0 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV authenticatie",
+"Save" => "Bewaren",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "De ingloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert de HTTP statuscodes 401 en 403 als invalide inloggegevens, en alle andere terugkoppelingen als valide inloggegevens."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 86b3ff5954ced2f0a5bca626ee08b462cf535573..e52c6c653fc2869ff79f222902573862d0ff5a8d 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-autentisering",
+"Save" => "Lagra",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/oc.php b/apps/user_webdavauth/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..42ef978066ee5d64a848e20e7d7495a8f82747ec
--- /dev/null
+++ b/apps/user_webdavauth/l10n/oc.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Enregistra"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 0a2702bbf6efbb57870699458e516a3cb90f9a3f..1f884f895aff0656c81586a0fa27330fc634dc22 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Uwierzytelnienie WebDAV",
+"Save" => "Zapisz",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Wtyczka sprawdza odpowiedź i będzie interpretował status HTTP 401 i 403 jako nieprawidłowe dane uwierzytelniające i wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 61c520c7c64b296377af7c0ddef0b7f55649530f..e3534fd90bf5614db8376a2afabb1e83a6ec2f89 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticação WebDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index 759318f6d37c84369c42643108895c757b8679f3..4cf989a968c4a1805c8fc99228c913c220ab173b 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticação WebDAV",
+"Save" => "Guardar",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do utilizador vão ser enviadas para endereço URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como válidas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 5780805a884d086ff57329daa9245751679508be..8fafe932ad0d79d1e963cf904f6717edb924e22a 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autentificare WebDAV"
+"WebDAV Authentication" => "Autentificare WebDAV",
+"Save" => "Salvează"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index 31626db4c8350b33edf32deec2fc1f4c5e25eca5..cfb31b1cb1e7ff4df4125a7eb41b6f1e1300175f 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Идентификация WebDAV",
+"Save" => "Сохранить",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/si_LK.php b/apps/user_webdavauth/l10n/si_LK.php
index cc5cfb3c9b2aad38015897e48c4fd44922faec45..661a8495c3058c093327dcd6c51741a439e70745 100644
--- a/apps/user_webdavauth/l10n/si_LK.php
+++ b/apps/user_webdavauth/l10n/si_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV යොමුව: http://"
+<?php
+$TRANSLATIONS = array(
+"Save" => "සුරකින්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/sk.php b/apps/user_webdavauth/l10n/sk.php
new file mode 100644
index 0000000000000000000000000000000000000000..9efe9fe65497e248d1c3eabedec3c6b7fd62f44b
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Uložiť"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 99e769ddc66224568282ad08bbe4890de79cbd27..694653d98771946a06f7bcbc553f4bd9af99d026 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV overenie",
+"Save" => "Uložiť",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index ae459025ae195196eb6922ed53c338ee22a0a6ce..1b0eed781415118443e7e56b1f573aa00ca763cb 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Overitev WebDAV",
+"Save" => "Shrani",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Uporabniška poverila bodo poslana na naveden naslov. Vstavek preveri odziv in kodi stanja 401 in 403 obravnava kot neveljavna poverila, vse ostale odzive pa kot veljavna."
);
$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_webdavauth/l10n/sq.php b/apps/user_webdavauth/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..66d3b2fb102a864b1ea385783aface41aded6ce0
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sq.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Ruaj"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/sr.php b/apps/user_webdavauth/l10n/sr.php
index 5cb00494033f9a7bc901c3bf30661df9b8562238..78f24013e5e04d94593da2cc0fab2f25a67a17eb 100644
--- a/apps/user_webdavauth/l10n/sr.php
+++ b/apps/user_webdavauth/l10n/sr.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV провера идентитета"
+"WebDAV Authentication" => "WebDAV провера идентитета",
+"Save" => "Сачувај"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/sr@latin.php b/apps/user_webdavauth/l10n/sr@latin.php
new file mode 100644
index 0000000000000000000000000000000000000000..3eb281117694071d0563b1002ace4871a6ead569
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sr@latin.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "Snimi"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index b0c2985169a4da825b5c26b0f3eccc2d457b072f..b0404000cb23d8fb9f292f35c0b4a4c8b076e813 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Autentisering",
+"Save" => "Spara",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ta_LK.php b/apps/user_webdavauth/l10n/ta_LK.php
index 9bd32954b058d9ad5c43d6604e9ba18e4bd559f3..fdf3ac7b15e0a2ca04fcf808426c1904a0a6b479 100644
--- a/apps/user_webdavauth/l10n/ta_LK.php
+++ b/apps/user_webdavauth/l10n/ta_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+<?php
+$TRANSLATIONS = array(
+"Save" => "சேமிக்க "
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/te.php b/apps/user_webdavauth/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3bf5e83cdebdf3d20ef2d6dba342ddb0d61b01c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/te.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "భద్రపరచు"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 102adaca4abaee6924a5725b014b3bb65163b046..c6120ba3090ad920c18679a1bc07b0edbad12961 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Authentication"
+"WebDAV Authentication" => "WebDAV Authentication",
+"Save" => "บันทึก"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 33dd2a887a9a0e7db994f7d18cf3a6a0136c7a90..f07b3d8174664cdd96cafb5e8203e095165fdeee 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Kimlik Doğrulaması",
+"Address:" => "Adres:",
+"Save" => "Kaydet",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
index 8ad7963d49fa4fa9fd3a72e9a60e4acfe28094f2..f4e736952c4bfd4850b102f1c12b51b9cda75122 100644
--- a/apps/user_webdavauth/l10n/ug.php
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش"
+"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش",
+"Save" => "ساقلا"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 326b9a03d87273d1150fb71dcf73c0c48ec63b7f..b548b01951b1e31fe054b3063e1ef7dffb499bf7 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Аутентифікація WebDAV",
+"Save" => "Зберегти",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/ur_PK.php b/apps/user_webdavauth/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..3546754a0d2e4954dea2ef90fb55207fb87e1ec5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ur_PK.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Save" => "حفظ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index 9ab2887962a1dbd34b1465a00defc1b4d3065bed..ee8a47151cec53dd0211580c04ecc902a34149e5 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "Xác thực WebDAV",
+"Save" => "Lưu",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 5e16945708ee7cea3256ad69fa178166e6d92413..c3ee68849b992743e0a3a61cb5f667cea0d27ab7 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 认证",
+"Save" => "保存",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_HK.php b/apps/user_webdavauth/l10n/zh_HK.php
index 72d95340768bc170dbd365b65eadfcb5e348b148..fa0e987fa3c7ee22b4b5a15f42d681421ec773ab 100644
--- a/apps/user_webdavauth/l10n/zh_HK.php
+++ b/apps/user_webdavauth/l10n/zh_HK.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 認證",
+"Save" => "儲存",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 72d95340768bc170dbd365b65eadfcb5e348b148..fa0e987fa3c7ee22b4b5a15f42d681421ec773ab 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 認證",
+"Save" => "儲存",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index 65ec8192744c52eafc5425b824f92d98b9b81ebf..483bd4b7f7dced46c1b8de20668d8ff60ba42702 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -69,6 +69,7 @@ $TRANSLATIONS = array(
"Error while changing permissions" => "Fallu mientres camudaben los permisos",
"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
"Shared with you by {owner}" => "Compartíu contigo por {owner}",
+"Share with user or group …" => "Compartir col usuariu o grupu ...",
"Share link" => "Compartir enllaz",
"Password protect" => "Protexer con contraseña",
"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
@@ -101,6 +102,7 @@ $TRANSLATIONS = array(
"Add" => "Amestar",
"Edit tags" => "Editar etiquetes",
"Please reload the page." => "Por favor, recarga la páxina",
+"The update was unsuccessful." => "L'anovamientu nun foi esitosu.",
"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
@@ -122,6 +124,9 @@ $TRANSLATIONS = array(
"Apps" => "Aplicaciones",
"Admin" => "Alministrador",
"Help" => "Ayuda",
+"Error loading tags" => "Fallu cargando les etiquetes",
+"Tag already exists" => "Yá esiste la etiqueta",
+"Error tagging" => "Fallu etiquetando",
"Access forbidden" => "Accesu denegáu",
"Cloud not found" => "Ñube non atopada",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
@@ -137,6 +142,7 @@ $TRANSLATIONS = array(
"Password" => "Contraseña",
"Data folder" => "Carpeta de datos",
"Configure the database" => "Configura la base de datos",
+"Only %s is available." => "Namái ta disponible %s",
"Database user" => "Usuariu de la base de datos",
"Database password" => "Contraseña de la base de datos",
"Database name" => "Nome de la base de datos",
@@ -154,6 +160,11 @@ $TRANSLATIONS = array(
"remember" => "recordar",
"Log in" => "Aniciar sesión",
"Alternative Logins" => "Anicios de sesión alternativos",
-"Thank you for your patience." => "Gracies pola to paciencia."
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
+"Thank you for your patience." => "Gracies pola to paciencia.",
+"%s will be updated to version %s." => "%s anovaráse a la versión %s.",
+"The following apps will be disabled:" => "Deshabilitaránse les siguientes aplicaciones:",
+"Start update" => "Aniciar anovamientu",
+"This ownCloud instance is currently being updated, which may take a while." => "Esta instancia de OwnCloud ta anguaño anovándose, polo que pue tardar un pocoñín."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b3a30a228ef47fb7b03ee6616179d6d494f06d13..d51a810b348b2dd331c7e654944c9c373f68b7d6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -158,11 +158,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Speicher & Datenbank",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
+"Only %s is available." => "Es sind nur %s verfügbar.",
"Database user" => "Datenbank-Benutzer",
"Database password" => "Datenbank-Passwort",
"Database name" => "Datenbank-Name",
"Database tablespace" => "Datenbank-Tablespace",
"Database host" => "Datenbank-Host",
+"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
"Finish setup" => "Installation abschließen",
"Finishing …" => "Abschließen ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Schnittstelle neu.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index dfceff4113f5108440e0412af61b761a4d4d7b38..4d1079d81a94059d0821e8ae27670021543e8d7c 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -158,11 +158,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Speicher & Datenbank",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
+"Only %s is available." => "Es sind nur %s verfügbar.",
"Database user" => "Datenbank-Benutzer",
"Database password" => "Datenbank-Passwort",
"Database name" => "Datenbank-Name",
"Database tablespace" => "Datenbank-Tablespace",
"Database host" => "Datenbank-Host",
+"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
"Finish setup" => "Installation abschließen",
"Finishing …" => "Abschließen ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Schnittstelle neu.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 716f6fdd4a8933759e721a93566c75d860630c22..88f94f254e16b9c016c906ff9e3484309034de8f 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -158,11 +158,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Tallennus ja tietokanta",
"Data folder" => "Datakansio",
"Configure the database" => "Muokkaa tietokantaa",
+"Only %s is available." => "Vain %s on käytettävissä.",
"Database user" => "Tietokannan käyttäjä",
"Database password" => "Tietokannan salasana",
"Database name" => "Tietokannan nimi",
"Database tablespace" => "Tietokannan taulukkotila",
"Database host" => "Tietokantapalvelin",
+"SQLite will be used as database. For larger installations we recommend to change this." => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
"Finish setup" => "Viimeistele asennus",
"Finishing …" => "Valmistellaan…",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Tämä sovellus vaatii toimiakseen JavaScriptin käyttöä. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä tämä käyttöliittymä.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index a6dd114c02181c9c92857c523a49c249a850a99d..c7ff0a923a5d92c5713fcf21354771262513bea5 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -33,13 +33,13 @@ $TRANSLATIONS = array(
"Settings" => "Axustes",
"Saving..." => "Gardando...",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"),
+"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","vai %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("hai %n hora","vai %n horas"),
"today" => "hoxe",
"yesterday" => "onte",
"_%n day ago_::_%n days ago_" => array("hai %n día","vai %n días"),
"last month" => "último mes",
-"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
+"_%n month ago_::_%n months ago_" => array("hai %n mes","vai %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
"Yes" => "Si",
@@ -64,7 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Contrasinal non moi aló",
"Good password" => "Bo contrasinal",
"Strong password" => "Contrasinal forte",
-"Shared" => "Compartir",
+"Shared" => "Compartido",
"Share" => "Compartir",
"Error" => "Erro",
"Error while sharing" => "Produciuse un erro ao compartir",
@@ -76,7 +76,7 @@ $TRANSLATIONS = array(
"Share link" => "Ligazón para compartir",
"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
"By default the public link will expire after {days} days" => "De xeito predeterminado, a ligazón pública caduca aos {days} días",
-"Password protect" => "Protexido con contrasinais",
+"Password protect" => "Protexido con contrasinal",
"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
"Allow Public Upload" => "Permitir o envío público",
"Email link to person" => "Enviar ligazón por correo",
@@ -86,7 +86,7 @@ $TRANSLATIONS = array(
"Share via email:" => "Compartir por correo:",
"No people found" => "Non se atopou xente",
"group" => "grupo",
-"Resharing is not allowed" => "Non se permite volver a compartir",
+"Resharing is not allowed" => "Non se permite volver compartir",
"Shared in {item} with {user}" => "Compartido en {item} con {user}",
"Unshare" => "Deixar de compartir",
"notify by email" => "notificar por correo",
@@ -110,7 +110,7 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}",
"No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.",
"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
-"Please reload the page." => "Volva a cargar a páxina.",
+"Please reload the page." => "Volva cargar a páxina.",
"The update was unsuccessful." => "A actualización foi satisfactoria.",
"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
"%s password reset" => "Restabelecer o contrasinal %s",
@@ -158,13 +158,15 @@ $TRANSLATIONS = array(
"Storage & database" => "Almacenamento e base de datos",
"Data folder" => "Cartafol de datos",
"Configure the database" => "Configurar a base de datos",
+"Only %s is available." => "Só está dispoñíbel %s.",
"Database user" => "Usuario da base de datos",
"Database password" => "Contrasinal da base de datos",
"Database name" => "Nome da base de datos",
"Database tablespace" => "Táboa de espazos da base de datos",
"Database host" => "Servidor da base de datos",
+"SQLite will be used as database. For larger installations we recommend to change this." => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
"Finish setup" => "Rematar a configuración",
-"Finishing …" => "Rematado ...",
+"Finishing …" => "Rematando ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Este aplicativo require que o JavaScript estea activado para unha operativa correcta. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Active o JavaScript</a> e volva a cargar a interface.",
"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
"Log out" => "Desconectar",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 3aa35741d49cd0e924a5025911334dcd20ad98ed..7c5478dff07947167332ec742f33f17d6ecaa625 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Modalità di manutenzione attivata",
"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
"Updated database" => "Database aggiornato",
+"Disabled incompatible apps: %s" => "Applicazione incompatibili disabilitate: %s",
"No image or file provided" => "Non è stata fornita alcun immagine o file",
"Unknown filetype" => "Tipo di file sconosciuto",
"Invalid image" => "Immagine non valida",
@@ -108,7 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Modifica etichette",
"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
+"Updating {productName} to version {version}, this may take a while." => "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
"Please reload the page." => "Ricarica la pagina.",
+"The update was unsuccessful." => "L'aggiornamento non è riuscito.",
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
"%s password reset" => "Ripristino password di %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.",
@@ -155,11 +158,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Archiviazione e database",
"Data folder" => "Cartella dati",
"Configure the database" => "Configura il database",
+"Only %s is available." => "È disponibile solo %s.",
"Database user" => "Utente del database",
"Database password" => "Password del database",
"Database name" => "Nome del database",
"Database tablespace" => "Spazio delle tabelle del database",
"Database host" => "Host del database",
+"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
"Finish setup" => "Termina la configurazione",
"Finishing …" => "Completamento...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "L'applicazione richiede che JavaScript sia abilitato per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa interfaccia.",
@@ -179,6 +184,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
"Thank you for your patience." => "Grazie per la pazienza.",
+"%s will be updated to version %s." => "%s sarà aggiornato alla versione %s.",
+"The following apps will be disabled:" => "Le seguenti applicazioni saranno disabilitate:",
+"The theme %s has been disabled." => "Il tema %s è stato disabilitato.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
+"Start update" => "Avvia l'aggiornamento",
"This ownCloud instance is currently being updated, which may take a while." => "Questa istanza di ownCloud è in fase di aggiornamento, potrebbe richiedere del tempo.",
"Please reload this page after a short time to continue using ownCloud." => "Ricarica questa pagina per poter continuare ad usare ownCloud."
);
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index 7c2c40dc509bc9b432016133cd534a7d26126ab3..fc87790f2896d9816c421b30edede035e37d4993 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
"If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
"Cancel" => "キャンセル",
"Continue" => "続ける",
-"(all selected)" => "(全て選択)",
+"(all selected)" => "(すべて選択)",
"({count} selected)" => "({count} 選択)",
"Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
"Very weak password" => "非常に弱いパスワード",
@@ -109,6 +109,7 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
"No tags selected for deletion." => "削除するタグが選択されていません。",
"Please reload the page." => "ページをリロードしてください。",
+"The update was unsuccessful." => "アップデートに失敗しました。",
"The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
"%s password reset" => "%s パスワードリセット",
"A problem has occurred whilst sending the email, please contact your administrator." => "メールの送信中に問題が発生しました。管理者に問い合わせください。",
@@ -155,6 +156,7 @@ $TRANSLATIONS = array(
"Storage & database" => "ストレージとデータベース",
"Data folder" => "データフォルダー",
"Configure the database" => "データベースを設定してください",
+"Only %s is available." => "%s のみ有効です。",
"Database user" => "データベースのユーザー名",
"Database password" => "データベースのパスワード",
"Database name" => "データベース名",
@@ -179,6 +181,8 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "これは、管理者のみがインスタンスを利用できることを意味しています。",
"Contact your system administrator if this message persists or appeared unexpectedly." => "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
"Thank you for your patience." => "しばらくお待ちください。",
+"%s will be updated to version %s." => "%s はバージョン %s にアップデートされました。",
+"Start update" => "アップデートを開始",
"This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在アップデート中のため、しばらく時間がかかります。",
"Please reload this page after a short time to continue using ownCloud." => "ownCloud を続けて利用するには、しばらくした後でページをリロードしてください。"
);
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index c13420e87c007dbc253cce2a7ed5a595a9daddde..cf94b52dec065d15beb2753c1626099f16bfefa2 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -158,11 +158,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Depolama ve veritabanı",
"Data folder" => "Veri klasörü",
"Configure the database" => "Veritabanını yapılandır",
+"Only %s is available." => "Sadece %s kullanılabilir.",
"Database user" => "Veritabanı kullanıcı adı",
"Database password" => "Veritabanı parolası",
"Database name" => "Veritabanı adı",
"Database tablespace" => "Veritabanı tablo alanı",
"Database host" => "Veritabanı sunucusu",
+"SQLite will be used as database. For larger installations we recommend to change this." => "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
"Finish setup" => "Kurulumu tamamla",
"Finishing …" => "Tamamlanıyor ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.",
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 6eeff9f6041adcf6f867009f934b4451a1e76830..92f757c47a752548e9e8bde0cc52dc84d3f05ddb 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index 7ad614d3969581fbabc47c219bfb353f48f6a4ed..245168c2fd3a33dfab181a7a7a7e44d0ee88f86c 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index 5a9cf50a8717887f971b4473cdab37929bbd45ea..4bbcf5cdbb5f089d24d68e6192c5e7cab2332909 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 23cb65b381b7f93ae2785c1710437fa12e69e9ad..0c26797936b9e90c9b192d9080d9b8810cf82967 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
index c6c4525ce35b09ff301e7974e94c56236fd8f73d..5a22cb13a692f5060e977d8043af58bc6bfc1c09 100644
--- a/l10n/ady/files_sharing.po
+++ b/l10n/ady/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index 1271015e671eb6cc61f76e086b7e7b4f22adb81c..ef90e5bc5eb6f8fc617052375fb7853830753e91 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index ba1d50c2965fd021bf6aaf6f180201689ee96de8..9f4b315ef90ba94d455dc9bebf689bb3be84a373 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# HannesNell <hannesn@workforce.co.za>, 2014
+# Hannes Nell <hannesn@workforce.co.za>, 2014
# kalliet <kst@fam-tank.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Instellings"
msgid "Saving..."
msgstr "Stoor..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekondes gelede"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute gelede"
msgstr[1] "%n minute gelede"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ure gelde"
msgstr[1] "%n ure gelede"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "vandag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "gister"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dae gelede"
msgstr[1] "%n dae gelede"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "verlede maand"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n maande gelede"
msgstr[1] "%n maande gelede"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "verlede jaar"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "jare gelede"
@@ -289,157 +289,165 @@ msgstr "Goeie wagwoord"
msgid "Strong password"
msgstr "Sterk wagwoord"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Gedeel"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Deel"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Deel veroorsaak fout"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Deel terugneem veroorsaak fout"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fout met verandering van regte"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Met jou en die groep {group} gedeel deur {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Met jou gedeel deur {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Beskerm met Wagwoord"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Laat Publieke Oplaai toe"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "E-pos aan persoon"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Stuur"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Stel verval datum"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Verval datum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Deel oor epos:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Geen persoon gevind"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "groep"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Hernieu deel is nie toegelaat nie "
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Gedeel in {item} met {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Deel terug neem"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan wysig"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "toegang beheer"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "skep"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "opdateer"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "uitvee"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "deel"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Beskerm met wagwoord"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fout met skrapping van verval datum"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fout met opstel van verval datum"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Stuur ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-pos gestuur"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Waarskuwing"
@@ -517,12 +525,13 @@ msgstr "Versoek het gefaal!<br>Het jy seker gemaak jou e-pos/gebruiker naam is k
msgid "You will receive a link to reset your password via Email."
msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, Ek wil regtig my wagwoord herstel"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Na aanteken-bladsy"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nuwe wagwoord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Herstel wagwoord"
@@ -684,58 +694,59 @@ msgstr "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien assebli
msgid "Create an <strong>admin account</strong>"
msgstr "Skep `n <strong>admin-rekening</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Wagwoord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Data vouer"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Stel databasis op"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Databasis-gebruiker"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Databasis-wagwoord"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Databasis naam"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Databasis tabelspasie"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databasis gasheer"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Maak opstelling klaar"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Wagwoord verloor?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "onthou"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Teken aan"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatiewe aantekeninge"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 2c007e7cf9f76c4be129c6916dddbf9668b44a60..63b3f418e94ceb0dea59f3b0feda1b984653bfe9 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Wagwoord"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 8fa411c161883d83c0c88d51f8689eaab6301d5b..08c51c1f8efdebfaf8e405bc47a6437059aa4db7 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index ab12b07d2cb6f4cd7855f0189cfab6542e0b75be..6890754e1bd257ee46094913ba866ccf696bdead 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po
index ef6b03c9db8f5605327bebeec04cc5688c12eabc..21b116312f526230cb0f777904fa5656a35e60c9 100644
--- a/l10n/ak/files_sharing.po
+++ b/l10n/ak/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index 772aac73bdad3c6a5e7cb9599672435f3dad2fb6..4e346e1ca8a2e481a6b0e1094eb53d6b02393a8c 100644
--- a/l10n/ak/lib.po
+++ b/l10n/ak/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index c74c0f188e8183c5db4292784b5986e76ac211b0..25a673f40755f07a5ee61f7538414f24ea459490 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po
index 1540cf20a49391af4fa2ed55a0b8d2bea38c59f4..8136f0d32dfd24cc8a2fdc0b4cf529b1c727abd4 100644
--- a/l10n/am_ET/files_sharing.po
+++ b/l10n/am_ET/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/am_ET/lib.po b/l10n/am_ET/lib.po
index f953cad50a448d1a496b264d325ed59f0b454a8b..f3c8b545d22c0e240cf12237c68500a6c6af6c18 100644
--- a/l10n/am_ET/lib.po
+++ b/l10n/am_ET/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 2f77cb53230906a7ce626774247f4546cbfcd039..ee1ccb2160edba565037f8afee9713db160d4701 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -150,11 +150,11 @@ msgstr "إعدادات"
msgid "Saving..."
msgstr "جاري الحفظ..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -164,7 +164,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -174,15 +174,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "اليوم"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -192,11 +192,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -206,11 +206,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "سنة مضت"
@@ -310,157 +310,165 @@ msgstr "كلمة السر جيدة"
msgid "Strong password"
msgstr "كلمة السر قوية"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "مشارك"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "شارك"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "خطأ"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "حصل خطأ عند عملية المشاركة"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "حصل خطأ عند عملية إزالة المشاركة"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "شورك معك من قبل {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "شارك الرابط"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "حماية كلمة السر"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "اسمح بالرفع للعامة"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "ارسل الرابط بالبريد الى صديق"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "أرسل"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاحية"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "مجموعة"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "لا يسمح بعملية إعادة المشاركة"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "شورك في {item} مع {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "إنشاء"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "تحديث"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "حذف"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "مشاركة"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "محمي بكلمة السر"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "تحذير"
@@ -538,12 +546,13 @@ msgstr "الطلب رفض! <br> هل انت متأكد أن الاسم/العن
msgid "You will receive a link to reset your password via Email."
msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "إسم المستخدم"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -551,11 +560,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "نعم، أريد إعادة ضبظ كلمة مروري"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -568,10 +577,11 @@ msgid "To login page"
msgstr "الى صفحة الدخول"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "كلمات سر جديدة"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "تعديل كلمة السر"
@@ -705,58 +715,59 @@ msgstr "لمزيد من المعلومات عن كيفية إعداد خادمك
msgid "Create an <strong>admin account</strong>"
msgstr "أضف </strong>مستخدم رئيسي <strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "كلمة المرور"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "مجلد المعلومات"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "أسس قاعدة البيانات"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "مستخدم قاعدة البيانات"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "كلمة سر مستخدم قاعدة البيانات"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "إسم قاعدة البيانات"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "مساحة جدول قاعدة البيانات"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "خادم قاعدة البيانات"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "انهاء التعديلات"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -798,19 +809,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "هل نسيت كلمة السر؟"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "تذكر"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "أدخل"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "اسماء دخول بديلة"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index d17e20453fa5df8bfffc6bc7f60f345a394ede12..3b1262140bb9c526901a8b3e1e93b1d8c0fcfff9 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ibrahim_9090 <ibrahim9090@gmail.com>, 2013
-# Meesh <M_almohimeed@yahoo.com>, 2013
+# Ebrahim Mohammed Gaber <ibrahim9090@gmail.com>, 2013
+# Mashael Almohaimeed <M_almohimeed@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 7aea04b6fceb7e1ed914dd01a6f8084c841df4f5..184a381307dc7f8204184da46d8e595ae0baff43 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "مشاركة من طرف {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "تم مشاركتها بواسطة"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "هذه المشاركة محمية بكلمة مرور"
@@ -54,7 +62,7 @@ msgstr "هذه المشاركة محمية بكلمة مرور"
msgid "The password is wrong. Try again."
msgstr "كلمة المرور خاطئة. حاول مرة أخرى"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "كلمة المرور"
@@ -90,15 +98,31 @@ msgstr "المشاركة غير مفعلة"
msgid "For more info, please ask the person who sent this link."
msgstr "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "تحميل"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "تحميل %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "رابط مباشر"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 64838b2dff4ba8138cc9bbd5ad407f5386fff626..1a8dc00fbfa9bade979dc769dbee0aaf258507a2 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -4,13 +4,13 @@
#
# Translators:
# Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2014
-# suliman <291101251@std.qu.edu.sa>, 2014
+# suliman al-ajlan <291101251@std.qu.edu.sa>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -475,3 +475,8 @@ msgstr "يجب ادخال كلمة مرور صحيحة"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index b9f6700f5c2a80ff453381cea20c6e155b1b8815..618e4788209c7f864ffb706e9078e80f0c98ed44 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -4,14 +4,14 @@
#
# Translators:
# ezidan <ezidan@live.com>, 2014
-# m.shehab <shehab.mahmood@gmail.com>, 2014
-# suliman <291101251@std.qu.edu.sa>, 2014
+# Mahmood Shehab <shehab.mahmood@gmail.com>, 2014
+# suliman al-ajlan <291101251@std.qu.edu.sa>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "إلغاء"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "بتاتا"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "الكل"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "مجموعة"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "الحصة النسبية الإفتراضية"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "إسم المستخدم"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "حصه"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 95f9001219a778075063ee5837f47197f634c841..655508ba6d2fb32b5cc2ea06e67f7890e0e46e46 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# m.shehab <shehab.mahmood@gmail.com>, 2014
+# Mahmood Shehab <shehab.mahmood@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 07028f6ea600fec3c36738f43b9c3ea529128710..f2584a1f776f2f998854a0bf64908ce99eec4ceb 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# TYMAH <hussein-atef@hotmail.com>, 2012
+# Hussein Atef Salem <hussein-atef@hotmail.com>, 2012
# aboodilankaboot, 2012
# blackcoder <tarek.taha@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "حفظ"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index 311d32e8530343143789871d04ed7c4fd6b4b2c2..88bdefc8c5595f9774468327afac1e3e519dcf8d 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# dixebra <davidlopezcastanon@gmail.com>, 2014
+# David López Castañón <davidlopezcastanon@gmail.com>, 2014
# Iñigo Varela <ivarela@softastur.org>, 2014
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -151,51 +151,51 @@ msgstr "Axustes"
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "fai segundos"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fai %n minutu"
msgstr[1] "fai %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fai %n hora"
msgstr[1] "fai %n hores"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "güei"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ayeri"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fai %n día"
msgstr[1] "fai %n díes"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "mes caberu"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fai %n mes"
msgstr[1] "fai %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "añu caberu"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "fai años"
@@ -291,157 +291,165 @@ msgstr "Contraseña bona"
msgid "Strong password"
msgstr "Contraseña mui bona"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartíu"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fallu"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fallu mientres la compartición"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fallu mientres se dexaba de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fallu mientres camudaben los permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartíu contigo y col grupu {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartíu contigo por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
-msgstr ""
+msgstr "Compartir col usuariu o grupu ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Compartir enllaz"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protexer con contraseña"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Escueyi una contraseña pal enllaz públicu"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir xuba pública"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enlláz de corréu electrónicu a la persona"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Unviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Afitar la data de caducidá"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de caducidá"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir vía corréu electrónicu:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nun s'atoparon persones"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupu"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Recompartir nun ta permitíu"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartíu en {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Dexar de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar per corréu"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pue editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control d'accesu"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "xubir"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "desaniciar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Contraseña protexida"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fallu desafitando la data de caducidá"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fallu afitando la fecha de caducidá"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Unviando ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Corréu unviáu"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Avisu"
@@ -483,7 +491,7 @@ msgstr "Por favor, recarga la páxina"
#: js/update.js:52
msgid "The update was unsuccessful."
-msgstr ""
+msgstr "L'anovamientu nun foi esitosu."
#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
@@ -519,12 +527,13 @@ msgstr "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu
msgid "You will receive a link to reset your password via Email."
msgstr "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nome d'usuariu"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sí, quiero reaniciar daveres la mio contraseña agora"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Reaniciar"
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "Aniciar sesión na páxina"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Contraseña nueva"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Restablecer contraseña"
@@ -590,11 +600,11 @@ msgstr "Ayuda"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Fallu cargando les etiquetes"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "Yá esiste la etiqueta"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
@@ -602,7 +612,7 @@ msgstr ""
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Fallu etiquetando"
#: tags/controller.php:86
msgid "Error untagging"
@@ -686,58 +696,59 @@ msgstr "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a
msgid "Create an <strong>admin account</strong>"
msgstr "Crea una <strong>cuenta d'alministrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contraseña"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Carpeta de datos"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configura la base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Namái ta disponible %s"
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuariu de la base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nome de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espaciu de tables de la base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Agospiador de la base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Finar la configuración "
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finando ..."
@@ -779,19 +790,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr "Por favor, contauta col to alministrador"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "¿Escaeciesti la to contraseña?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "recordar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Aniciar sesión"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Anicios de sesión alternativos"
@@ -800,7 +811,7 @@ msgstr "Anicios de sesión alternativos"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -823,11 +834,11 @@ msgstr "Gracies pola to paciencia."
#: templates/update.admin.php:3
#, php-format
msgid "%s will be updated to version %s."
-msgstr ""
+msgstr "%s anovaráse a la versión %s."
#: templates/update.admin.php:7
msgid "The following apps will be disabled:"
-msgstr ""
+msgstr "Deshabilitaránse les siguientes aplicaciones:"
#: templates/update.admin.php:17
#, php-format
@@ -842,12 +853,12 @@ msgstr ""
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "Aniciar anovamientu"
#: templates/update.user.php:3
msgid ""
"This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Esta instancia de OwnCloud ta anguaño anovándose, polo que pue tardar un pocoñín."
#: templates/update.user.php:4
msgid "Please reload this page after a short time to continue using ownCloud."
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
index 6f0a3746c8c1dd965b0c301a5f1a34fd1e94a4d8..559fb59c8cf8af214228d14fb0780c00d5bad308 100644
--- a/l10n/ast/files.po
+++ b/l10n/ast/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
# tebanpb <peruyero@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
index 6374556eaac74dde37bb68546491c60b3fd3046d..5fa945735fdbe0a400e1fa1b316340968f860220 100644
--- a/l10n/ast/files_sharing.po
+++ b/l10n/ast/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# dixebra <davidlopezcastanon@gmail.com>, 2014
+# David López Castañón <davidlopezcastanon@gmail.com>, 2014
# Iñigo Varela <ivarela@softastur.org>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +20,42 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Compartío contigo"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Compartío con otros"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Entá nun se compartieron ficheros contigo."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
+msgstr "Entá nun compartiesti dengún ficheru."
+
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartíu por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartíu por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esta compartición tien contraseña protexida"
@@ -55,7 +64,7 @@ msgstr "Esta compartición tien contraseña protexida"
msgid "The password is wrong. Try again."
msgstr "La contraseña ye incorreuta. Inténtalo otra vegada."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contraseña"
@@ -91,15 +100,31 @@ msgstr "compartir ta desactiváu"
msgid "For more info, please ask the person who sent this link."
msgstr "Pa más información, entrúga-y a la persona qu'unvió esti enllaz"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Baxar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Descargar %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Enllaz direutu"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
index 3820def5c564c1e09dbc3dc99c6c913cca1ec59c..49710b1b08cbcb47312b66f04a5d7c848b6b4904 100644
--- a/l10n/ast/lib.po
+++ b/l10n/ast/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Tas accediendo al sirvidor dende un dominiu non confiáu."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Tien d'apurrise una contraseña válida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "El nome d'usuariu yá ta usándose"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index da3682db1b8c80eeefc57955b36c58e890b988a6..afa4f9cb89bb99919317005e290522019b3f7535 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -4,14 +4,14 @@
#
# Translators:
# Iñigo Varela <ivarela@softastur.org>, 2014
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 10:41+0000\n"
+"Last-Translator: Ḷḷumex03 <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -285,7 +285,7 @@ msgstr "Restaurar claves de cifráu."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Nun pue desaniciase"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
@@ -321,7 +321,7 @@ msgstr "Desaniciar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "enxamás"
#: js/users/users.js:371
msgid "add group"
@@ -645,7 +645,7 @@ msgstr "Dende la direición"
#: templates/admin.php:386
msgid "mail"
-msgstr ""
+msgstr "corréu"
#: templates/admin.php:407
msgid "Authentication required"
@@ -743,7 +743,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Toos"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -913,19 +913,19 @@ msgstr ""
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Amestar grupu"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupu"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Toos"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Almins"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
@@ -957,7 +957,7 @@ msgstr ""
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Aniciu de sesión caberu"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 8708eaaa50eac8b90bed391e4d4f79abe0b91291..dc33c156895b122bf507c6a869a38abc23ce70ce 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# dixebra <davidlopezcastanon@gmail.com>, 2014
-# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# David López Castañón <davidlopezcastanon@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
+# Ḷḷumex03 <l.lumex03.tornes@gmail.com>, 2014
# tebanpb <peruyero@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 11:02+0000\n"
+"Last-Translator: Ḷḷumex03 <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -143,7 +144,7 @@ msgstr ""
#: js/settings.js:865
msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar desaniciu"
#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
diff --git a/l10n/ast/user_webdavauth.po b/l10n/ast/user_webdavauth.po
index f416c61cb8372b715632d5e1b72d21a94d85e5ca..8c88c0c5d4545c3fe5cab737964dc5e719c80d96 100644
--- a/l10n/ast/user_webdavauth.po
+++ b/l10n/ast/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/az/core.po b/l10n/az/core.po
index b9e66508ef3721fddadcf19c1bc89044d9c0186e..e98e9507d011394ba6ceec7e76b8fdc9bd7f2835 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po
index 057a2d0612223921e386e264d7b9558d4b4fcdc8..9ee06a30cf4d945f2adbfa04138130ac74711f96 100644
--- a/l10n/az/files_sharing.po
+++ b/l10n/az/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index 31aea374ce317ad6540f1addedb09c011c0a7982..1936c67d262f90e7ba529bda486dffb4a550eb8a 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 6b125b3a13706695d65a2147e60ddc41b4b609dd..70baa81a04f4ab6138390c48419ecfdabf0add9a 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# VladVaranetski <vlad.voronecky@gmail.com>, 2014
+# Vlad Varanetski <vlad.voronecky@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -148,11 +148,11 @@ msgstr "Налады"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Секунд таму"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -160,7 +160,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -168,15 +168,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "Сёння"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "Ўчора"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -184,11 +184,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "У мінулым месяцы"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -196,11 +196,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "У мінулым годзе"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "Гадоў таму"
@@ -298,157 +298,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Памылка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -526,12 +534,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -539,11 +548,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -556,10 +565,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -693,58 +703,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Завяршыць ўстаноўку."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -786,19 +797,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index cf93650d7dcc4c9bb2a8fa3d4126312d61f31fd4..eecbe36b3ef5e5a5cb07ba0bbd6e4ad27fd1813e 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index c2c7575709df3c73d5aac844acda8feb3ea2604e..cbf16d4165f5ec5e1e3ff08fb7d88ab51a723582 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -465,3 +465,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index d6d34446a08d2a01cd9ecb6e119c048637eb89d1..fb4a06fc678e3e7c08db49f5a5eaed4723efd892 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# cybertorture, 2014
+# George Kamenov, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Настройки"
msgid "Saving..."
msgstr "Записване..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "днес"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "последният месец"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "последната година"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "последните години"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Споделено"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Споделяне"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Грешка при споделяне"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Грепка докато се премахва споделянето"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Грешка при промяна на достъпност"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Споделено с тебе и група {group} от {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Споделено с тебе от {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Защитено с парола"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Изпрати връзка до пощата на някои"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Изпрати"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Посочи дата на изтичане"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Дата на изтичане"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "сподели по поща:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Не са открити хора"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "група"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Допълнително споделяне не е разрешено"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Споделено в {item} с {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Премахни споделяне"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "може да променя"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "контрол на достъпа"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "създаване"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "Обновяване"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "Изтриване"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "Споделяне"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Защитено с парола"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Грешка при премахване на дата за изтичане"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Грепка при поставяне на дата за изтичане"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Изпращам ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Пощата е изпратена"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Внимание"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Ще получите връзка за нулиране на паролата Ви."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Потребител"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Нова парола"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Нулиране на парола"
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Създаване на <strong>админ профил</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Парола"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Директория за данни"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Конфигуриране на базата"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Потребител за базата"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Парола за базата"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Име на базата"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Хост за базата"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Завършване на настройките"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Забравена парола?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "запомни"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Вход"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 33b6bf89dde0892268e7b8a5f88dec4a2f844c49..88f610e480453b10e091cd361f2a0878da6877d9 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 0d9cf3686cdb1d236c5ad2b47ade9a13a7cf400c..60e09e7f4a4c759b005b79e6bf2ce96da9358b41 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Споделено от"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Парола"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Изтегляне"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index eae99eb39cf1c93a31496f0b51ec764a917d58f8..a26a447462676ec9c9c07ba09d61b801bd526ac5 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Димитър Кръстев <dimitar.t.krastev@gmail.com>, 2013
+# Dimitar Krastev <dimitar.t.krastev@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 6de45e9926c946db6a9692f066ce1124a0b66431..f36482959b95549b5451c73d47e66475bda79033 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Изтриване"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "никога"
#: js/users/users.js:371
msgid "add group"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Квота по подразбиране"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Потребител"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Квота"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index b1fc1ff2096b2149f25341628eb55107dc61be3f..b8f4d3590c0a8fe8fb13a377294c70d11e6bea9d 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index c337453076e812a600f59b71cd5f151e6d2b4b8d..1dd580e37724ac315115f315b9071cc12791d765 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Запис"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 79368c57e7b559b17ac71eccc357d0fe590095d6..f8d29f3344a76c69924d09b08f875036f8cab47b 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "নিয়ামকসমূহ"
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "আজ"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "ভাগাভাগিকৃত"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "সমস্যা"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে "
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "অনুমতিসমূহ পরিবর্তন করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} আপনার সাথে ভাগাভাগি করেছেন"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "কূটশব্দ সুরক্ষিত"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "পাঠাও"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "পাঠানো হচ্ছে......"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "সতর্কবাণী"
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ব্যবহারকারী"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr "প্রবেশ পৃষ্ঠায়"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "নতুন কূটশব্দ"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "কূটশব্দ পূনঃনির্ধারণ কর"
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "কূটশব্দ"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "ডাটা ফোল্ডার "
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "ডাটাবেচ কনফিগার করুন"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "ডাটাবেজ ব্যবহারকারী"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "ডাটাবেজ কূটশব্দ"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "ডাটাবেজের নাম"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "ডাটাবেজ টেবলস্পেস"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "ডাটাবেজ হোস্ট"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "সেটআপ সুসম্পন্ন কর"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "কূটশব্দ হারিয়েছেন?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "মনে রাখ"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "প্রবেশ"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 2765da38e1cb91adad69a263eec2386a7989f390..4b21d36efc7f32d15101caf5765ec9cf352c6d1a 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 1e5d3a4774c83b961ce855fa5b681bf78a9f8a0b..2205ca1a8a1934aa036636b16f5f35e82dca6f47 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "কূটশব্দ"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ডাউনলোড"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 1431156150e3ebfeab6bfb28f61c812b6cf203ca..27b807f10190119c5578bc3453343084c5bc1fb3 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 17c16e6d9e5ad5686115fd8251fd3a945ffae112..b631d92be14e1211f380cb77837bbcd598d7a2b7 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "মুছে"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "কখনোই নয়"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 877377d8fcfe8762a1991993385656913a1f0302..eaef5ee240ac5a3e10010efaab921219aab9191f 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 09f42276e6b485f10a0df1489499346928fedf00..e85bf73388cde3e00d04c8fa4352259c53099a47 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013
+# shubhra <paul_shubhra@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "সংরক্ষণ"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po
index 1256f929b416a5de236338366baf16ab86ad4e7f..224ee0569be00ea486ecbae55582bc966daa3a67 100644
--- a/l10n/bn_IN/core.po
+++ b/l10n/bn_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po
index d1ea67d4d84a0e3df542b5baaedf35bc01bee372..1012cc3b573c2cab520af14c89d2dd3ebbcdabe8 100644
--- a/l10n/bn_IN/files_sharing.po
+++ b/l10n/bn_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: bn_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/bn_IN/lib.po b/l10n/bn_IN/lib.po
index 459df9c69dbb72dd5a9b285c33eb2eb40d3dd1cf..daf93c48406a736841b5b666064599c682d44677 100644
--- a/l10n/bn_IN/lib.po
+++ b/l10n/bn_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bn_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 79818a461da69ef4412154c3a8081e2f1154e0da..7451a2142fe1c4a2ebe753284dad7c8252f5128c 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -147,55 +147,55 @@ msgstr ""
msgid "Saving..."
msgstr "Spašavam..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -292,157 +292,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -520,12 +528,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -533,11 +542,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -550,10 +559,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -687,58 +697,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -780,19 +791,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 936a7e942ff4e2d6a557c6427b890f007be0584a..a3f8c13daddae77310ebd5ca30ccc4e0c001163c 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 7a796bbc568f1ddbb5a8f3a3ed5e17a3f06873ae..48e4373c7e7e374924116ef839d3580c4dd20d37 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Dijeli"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 56dbe7092ed6c571b994fc3f9e46ec6e81ecf7fc..bca48a1361c57a9f85216a31a1112501e16a19e7 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 6ce7bfaf7c8cb849cfb422282cf01eb3326528aa..00e180f1b6a7f48b012a504bad5289d3af81609b 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/user_webdavauth.po b/l10n/bs/user_webdavauth.po
index cf3d01b4bf92bf5679a5fed030dee6e2fb773bab..6b826ced0cb7ea8aad5665a7d9412265a8cf82c7 100644
--- a/l10n/bs/user_webdavauth.po
+++ b/l10n/bs/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Spasi"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index d61931ae9b6a80b99132eb3951212a73edd96c79..c7f95ee6a4c63e560d11dcf003e35c18c7d6e636 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -150,51 +150,51 @@ msgstr "Configuració"
msgid "Saving..."
msgstr "Desant..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "avui"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fa %n dies"
msgstr[1] "fa %n dies"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "anys enrere"
@@ -290,157 +290,165 @@ msgstr "Contrasenya bona"
msgid "Strong password"
msgstr "Contrasenya forta"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartit"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error en compartir"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error en deixar de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error en canviar els permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartit amb vos i amb el grup {group} per {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartit amb vos per {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Comparteix amb usuari o grup..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Enllaç de compartició"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permet pujada pública"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enllaç per correu electrónic amb la persona"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Envia"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Estableix la data de venciment"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grup"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notifica per correu electrònic"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crea"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualitza"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "elimina"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "comparteix"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Avís"
@@ -518,12 +526,13 @@ msgstr "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és cor
msgid "You will receive a link to reset your password via Email."
msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nom d'usuari"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -531,11 +540,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sí, vull restablir ara la contrasenya"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Estableix de nou"
@@ -548,10 +557,11 @@ msgid "To login page"
msgstr "A la pàgina d'inici de sessió"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Contrasenya nova"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
@@ -685,58 +695,59 @@ msgstr "Per informació de com configurar el servidor, comproveu la <a href=\"%s
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte d'administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contrasenya"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Emmagatzematge i base de dades"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Carpeta de dades"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configura la base de dades"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuari de la base de dades"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contrasenya de la base de dades"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nom de la base de dades"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espai de taula de la base de dades"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Ordinador central de la base de dades"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Acaba la configuració"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Acabant..."
@@ -778,19 +789,19 @@ msgstr "L'autenticació del servidor ha fallat!"
msgid "Please contact your administrator."
msgstr "Contacteu amb l'administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Heu perdut la contrasenya?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "recorda'm"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Inici de sessió"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Acreditacions alternatives"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b8c03c7a43f39165092bf8b859ee325c7c157b42..d7de77960a1cdbd6892ef416842a6f14f05a071f 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -7,13 +7,13 @@
# jmontane <joan@montane.cat>, 2013
# Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
# mickymadsystems <micky@madsystems.cat>, 2014
-# black_star <peredelgrau@hotmail.com>, 2014
+# Peredelgrau <peredelgrau@hotmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 1292a470d54818ff1d6700b3f22b88eb4ec704ce..1bcff5b3171ade23a0a2ebfd33398fdce175c004 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartits per {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartit per"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Aquest compartit està protegit amb contrasenya"
@@ -54,7 +62,7 @@ msgstr "Aquest compartit està protegit amb contrasenya"
msgid "The password is wrong. Try again."
msgstr "la contrasenya és incorrecta. Intenteu-ho de nou."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contrasenya"
@@ -90,15 +98,31 @@ msgstr "s'ha desactivat la compartició"
msgid "For more info, please ask the person who sent this link."
msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Baixa"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Baixa %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Enllaç directe"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 94a6324ef9aa924333c85760c642560de611fdae..e2dea97dd564144724a8df978adc0d87e4e42de7 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr "Heu de facilitar una contrasenya vàlida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "El nom d'usuari ja està en ús"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 8b275dd935e361dbdd2003f3e0d49a0802fef45a..3030c7bda387865d3675c4028c35d6fa0668b52b 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "Esborra"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "mai"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Tots"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grup"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota per defecte"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "Nom d'usuari"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 6f49ff0a07da56b2a35e1c0def07819bc07bc203..e2a28dd06d0efd9f5fe5de5b6ff952db201f416e 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index b42a98bd3e0893094dccae5567ed32a4448feeef..e4961493e64403aebf76b852549dde9d071bc774 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Desa"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ca@valencia/core.po b/l10n/ca@valencia/core.po
index be12c1d1b97a333a6d29fbe65779c30bd81ea3e9..a40d0d6f984f85cc3b4819c359da83bf250fe4d8 100644
--- a/l10n/ca@valencia/core.po
+++ b/l10n/ca@valencia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ca@valencia/files_sharing.po b/l10n/ca@valencia/files_sharing.po
index 93d817b5a7ceb9a05d0ad6355b65c55658adb5f2..06eed08d3526cd460d9161a0a344a4f5550240d7 100644
--- a/l10n/ca@valencia/files_sharing.po
+++ b/l10n/ca@valencia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ca@valencia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ca@valencia/lib.po b/l10n/ca@valencia/lib.po
index d2cebfb711c6065d8c48ae398b27f2d50150deb4..2e4e404c43eaebe36aae1ea3039c7259ead92e06 100644
--- a/l10n/ca@valencia/lib.po
+++ b/l10n/ca@valencia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ca@valencia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index f7c4bebb086c779f207c7462c87a12f343dffcf8..071e0cce06a3ed55b32c0edc24f86956009e5efa 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# janinko <janinko.g@gmail.com>, 2013
-# dibalaj <dibalaj@dibalaj.cz>, 2013
-# Honza K. <honza889@gmail.com>, 2013
-# liska_, 2013
-# svetlemodry <jaroslav@lichtblau.cz>, 2014
-# Martin <fireball@atlas.cz>, 2013
-# m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013-2014
+# Honza Brázdil <janinko.g@gmail.com>, 2013
+# Jakub Dibala <dibalaj@dibalaj.cz>, 2013
+# Jan Kalina <honza889@gmail.com>, 2013
+# Jan Liska, 2013
+# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014
+# Martin Skopal <fireball@atlas.cz>, 2013
+# MICHAL D. <black23@gmail.com>, 2014
+# Petr Šťastný <petr@stastny.eu>, 2013-2014
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -156,55 +156,55 @@ msgstr "Nastavení"
msgid "Saving..."
msgstr "Ukládám..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "před %n minutou"
msgstr[1] "před %n minutami"
msgstr[2] "před %n minutami"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "před %n hodinou"
msgstr[1] "před %n hodinami"
msgstr[2] "před %n hodinami"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "dnes"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "včera"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "minulý měsíc"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "před %n měsícem"
msgstr[1] "před %n měsíci"
msgstr[2] "před %n měsíci"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "před lety"
@@ -301,157 +301,165 @@ msgstr "Dobré heslo"
msgid "Strong password"
msgstr "Silné heslo"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Sdílené"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Sdílet"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Chyba při sdílení"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Chyba při rušení sdílení"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Chyba při změně oprávnění"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "S Vámi a skupinou {group} sdílí {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "S Vámi sdílí {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Sdílet s uživatelem nebo skupinou"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Sdílet odkaz"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Veřejný odkaz nevyprší dříve než za {days} dní po svém vytvoření"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Ve výchozím nastavení vyprší veřejný odkaz za {days} dní"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Chránit heslem"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Zadej heslo pro tento veřejný odkaz"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Povolit veřejné nahrávání"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Odeslat osobě odkaz e-mailem"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Odeslat"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Nastavit datum vypršení platnosti"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Datum vypršení platnosti"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Sdílet e-mailem:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Žádní lidé nenalezeni"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "skupina"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Sdílení již sdílené položky není povoleno"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Sdíleno v {item} s {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "upozornit e-mailem"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "vytvořit"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "smazat"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "sdílet"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňování data vypršení platnosti"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Chyba při nastavení data vypršení platnosti"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Odesílám ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail odeslán"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Varování"
@@ -529,12 +537,13 @@ msgstr "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a
msgid "You will receive a link to reset your password via Email."
msgstr "E-mailem Vám bude zaslán odkaz pro obnovu hesla."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Uživatelské jméno"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -542,11 +551,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ano, opravdu si nyní přeji obnovit mé heslo"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Restartovat složku"
@@ -559,10 +568,11 @@ msgid "To login page"
msgstr "Na stránku přihlášení"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nové heslo"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Obnovit heslo"
@@ -696,58 +706,59 @@ msgstr "Pro informace, jak správně nastavit váš server, se podívejte do <a
msgid "Create an <strong>admin account</strong>"
msgstr "Vytvořit <strong>účet správce</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Heslo"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Úložiště & databáze"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Složka s daty"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Nastavit databázi"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Uživatel databáze"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Heslo databáze"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Název databáze"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tabulkový prostor databáze"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Hostitel databáze"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Dokončit nastavení"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Dokončuji..."
@@ -789,19 +800,19 @@ msgstr "Autentizace na serveru selhala!"
msgid "Please contact your administrator."
msgstr "Kontaktujte prosím vašeho správce."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ztratili jste své heslo?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "zapamatovat"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Přihlásit"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternativní přihlášení"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index c6f61041700522f8594cc9d0a170306d64c8f336..1780171edd623f1915242bf0aba786525eb08d9a 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,22 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Twiguard, 2013
-# dibalaj <dibalaj@dibalaj.cz>, 2013
-# Honza K. <honza889@gmail.com>, 2013
-# liska_, 2013-2014
-# svetlemodry <jaroslav@lichtblau.cz>, 2014
-# xmorave2 <josef.moravec@gmail.com>, 2014
-# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
-# m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013
+# Albion von Darx, 2013
+# Jakub Dibala <dibalaj@dibalaj.cz>, 2013
+# Jan Kalina <honza889@gmail.com>, 2013
+# Jan Liska, 2013-2014
+# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014
+# Josef Moravec <josef.moravec@gmail.com>, 2014
+# Lenka <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# MICHAL D. <black23@gmail.com>, 2014
+# Petr Šťastný <petr@stastny.eu>, 2013
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index c37b2a5558a4909bb3beac7b7b7bb46481cb1476..2ce586033947e229f1024eb311a7b82bcf5cef9a 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# liska_, 2013
-# m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013-2014
+# Jan Liska, 2013
+# MICHAL D. <black23@gmail.com>, 2014
+# Petr Šťastný <petr@stastny.eu>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Sdílí {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Sdílí"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Toto sdílení je chráněno heslem"
@@ -56,7 +64,7 @@ msgstr "Toto sdílení je chráněno heslem"
msgid "The password is wrong. Try again."
msgstr "Heslo není správné. Zkuste to znovu."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Heslo"
@@ -92,15 +100,31 @@ msgstr "sdílení je zakázané"
msgid "For more info, please ask the person who sent this link."
msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Stáhnout"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Stáhnout %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Přímý odkaz"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 2d22295059114ace21ef21df9d9309e761e36539..db212d4dfdaffa12bab51157c9f4f1a0113955c1 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Honza K. <honza889@gmail.com>, 2013-2014
-# liska_, 2013
-# svetlemodry <jaroslav@lichtblau.cz>, 2014
-# xmorave2 <josef.moravec@gmail.com>, 2014
-# m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013-2014
+# Jan Kalina <honza889@gmail.com>, 2013-2014
+# Jan Liska, 2013
+# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014
+# Josef Moravec <josef.moravec@gmail.com>, 2014
+# MICHAL D. <black23@gmail.com>, 2014
+# Petr Šťastný <petr@stastny.eu>, 2013-2014
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Přistupujete na server z nedůvěryhodné domény."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -468,3 +468,8 @@ msgstr "Musíte zadat platné heslo"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Uživatelské jméno je již využíváno"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 7a038f91b17049e8f55b482134cc3d1b982842ec..c86ac4212517764e7b00af2762269937ff68d1a8 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,20 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Twiguard, 2013
-# Honza K. <honza889@gmail.com>, 2013
-# liska_, 2013
-# svetlemodry <jaroslav@lichtblau.cz>, 2014
-# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
-# m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013-2014
+# Albion von Darx, 2013
+# Jan Kalina <honza889@gmail.com>, 2013
+# Jan Liska, 2013
+# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014
+# Lenka <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# MICHAL D. <black23@gmail.com>, 2014
+# Petr Šťastný <petr@stastny.eu>, 2013-2014
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -327,7 +327,7 @@ msgstr "Smazat"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nikdy"
#: js/users/users.js:371
msgid "add group"
@@ -749,7 +749,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Vše"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -923,7 +923,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Skupina"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -935,7 +935,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Výchozí kvóta"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -955,7 +955,7 @@ msgstr "Uživatelské jméno"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index e4b250c0a014f25c0d59df664dbdd741b2b8d053..f95f1eae52d4cfc16eb421746633df5018d6fc6f 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Twiguard, 2013
-# Honza K. <honza889@gmail.com>, 2013
-# liska_, 2013
-# svetlemodry <jaroslav@lichtblau.cz>, 2014
-# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
-# pstast <petr@stastny.eu>, 2013-2014
+# Albion von Darx, 2013
+# Jan Kalina <honza889@gmail.com>, 2013
+# Jan Liska, 2013
+# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014
+# Lenka <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# Petr Šťastný <petr@stastny.eu>, 2013-2014
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 902f5e4d68c5565607b1b5960cfde7dec0aed7d2..73115ef464a65b549ca55e1772924487911dc4ef 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Honza K. <honza889@gmail.com>, 2013
+# Jan Kalina <honza889@gmail.com>, 2013
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Uložit"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 482304cfb3ad04e3d09e122b50dc7dcddb1dc4c4..33969819c91098e7d0ff90e9776461d073398891 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
+# Owen Llywelyn <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -148,11 +148,11 @@ msgstr "Gosodiadau"
msgid "Saving..."
msgstr "Yn cadw..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -160,7 +160,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -168,15 +168,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "heddiw"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -184,11 +184,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -196,11 +196,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -298,157 +298,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Rhannwyd"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Gwall"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Gwall wrth ddad-rannu"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Gwall wrth newid caniatâd"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Rhannwyd â chi gan {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Diogelu cyfrinair"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "E-bostio dolen at berson"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Anfon"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Gosod dyddiad dod i ben"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grŵp"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "creu"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "diweddaru"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "dileu"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "rhannu"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Rhybudd"
@@ -526,12 +534,13 @@ msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost."
msgid "You will receive a link to reset your password via Email."
msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Enw defnyddiwr"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -539,11 +548,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -556,10 +565,11 @@ msgid "To login page"
msgstr "I'r dudalen mewngofnodi"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Cyfrinair newydd"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Ailosod cyfrinair"
@@ -693,58 +703,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Cyfrinair"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Plygell data"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Cyflunio'r gronfa ddata"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Defnyddiwr cronfa ddata"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Cyfrinair cronfa ddata"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Enw cronfa ddata"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tablespace cronfa ddata"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Gwesteiwr cronfa ddata"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Gorffen sefydlu"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -786,19 +797,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Wedi colli'ch cyfrinair?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "cofio"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Mewngofnodi"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Mewngofnodiadau Amgen"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index a1df7152dda927e8560860e21ca5bc42e18cb397..4a80c2feebf43a137866477c812312f092265a41 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index a125f8a98d275de278458f6ad8cc2ba3dff7eb0a..1f125b32d687a311a0a74115bea05c84856e6cb1 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Rhannwyd gan"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Cyfrinair"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Llwytho i lawr"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index d8c7d897b0674e1a0ba0ef0b7710ac0e62b997f8..9df8773296bc90cf0f9976a4ee792cbc5be899e4 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -465,3 +465,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index c9b0af293effdb68354eb294403c5f7916a27c05..eec7bd6e745d012dc8a1ac7d79a8eabf6d261222 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Dileu"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "byth"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 18e7545fcd0b63959c29261012138dc1e713d5be..2629cef54e20c113c95f41c1fd5f35033696a45b 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index ec608e5423a1026cf018388f81154c8e278406fe..9a5b881faf1894c0cfdd0537c3134761b88dcd2c 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Cadw"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 7ea286fa449535a5b42593a1de72b7a4a16229ff..519d62693fa185f4df80fc450fa8602ee58f63bb 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,10 +3,10 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013-2014
-# claus_chr <claus_chr@webspeed.dk>, 2013
-# kaffeldt <kasper.affeldt@gmail.com>, 2013
-# lodahl <leiflodahl@gmail.com>, 2013
+# Anders J. Sørensen, 2013-2014
+# Claus Christensen <claus_chr@webspeed.dk>, 2013
+# Kasper Affeldt <kasper.affeldt@gmail.com>, 2013
+# Leif Lodahl <leiflodahl@gmail.com>, 2013
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2014
# Ole Holm Frandsen <froksen@gmail.com>, 2013
# Peter Jespersen <flywheeldk@gmail.com>, 2013
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -154,51 +154,51 @@ msgstr "Indstillinger"
msgid "Saving..."
msgstr "Gemmer..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "i dag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "sidste år"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "år siden"
@@ -294,157 +294,165 @@ msgstr "Godt kodeord"
msgid "Strong password"
msgstr "Stærkt kodeord"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Delt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Del"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fejl"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fejl under deling"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fejl under annullering af deling"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fejl under justering af rettigheder"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med dig og gruppen {group} af {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Delt med dig af {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Del med bruger eller gruppe ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Del link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Tillad Offentlig Upload"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "E-mail link til person"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Send"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Vælg udløbsdato"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Giv besked med mail"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "opret"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "opdater"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "slet"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "del"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail afsendt"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Advarsel"
@@ -522,12 +530,13 @@ msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn va
msgid "You will receive a link to reset your password via Email."
msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Brugernavn"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -535,11 +544,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, Jeg ønsker virkelig at nulstille mit kodeord"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Nulstil"
@@ -552,10 +561,11 @@ msgid "To login page"
msgstr "Til login-side"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nyt kodeord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Nulstil kodeord"
@@ -689,58 +699,59 @@ msgstr "For information om, hvordan du konfigurerer din server korrekt se <a hre
msgid "Create an <strong>admin account</strong>"
msgstr "Opret en <strong>administratorkonto</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Kodeord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Lager & database"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Databasebruger"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Databasekodeord"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Navn på database"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Database tabelplads"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databasehost"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Afslut opsætning"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Færdigbehandler ..."
@@ -782,19 +793,19 @@ msgstr "Server side godkendelse mislykkedes!"
msgid "Please contact your administrator."
msgstr "Kontakt venligst din administrator"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Mistet dit kodeord?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "husk"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Log ind"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative logins"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 18aebe2231fded3e68f02fb0cbc1df4f05b84b6f..3449a533ff366a02fa9e3fc97e8e48d321185408 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013-2014
-# claus_chr <claus_chr@webspeed.dk>, 2013
-# lodahl <leiflodahl@gmail.com>, 2013
-# Amplificator, 2014
+# Anders J. Sørensen, 2013-2014
+# Claus Christensen <claus_chr@webspeed.dk>, 2013
+# Leif Lodahl <leiflodahl@gmail.com>, 2013
+# Martin L. R., 2014
# Ole Holm Frandsen <froksen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index b15141c24ea60e84b3ced8703c4a9584dff466f2..2f38f2a72d930ef338acb2d688958419b569797a 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013
-# lodahl <leiflodahl@gmail.com>, 2013
-# Amplificator, 2014
+# Anders J. Sørensen, 2013
+# Leif Lodahl <leiflodahl@gmail.com>, 2013
+# Martin L. R., 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt af {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Delt af"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Delingen er beskyttet af kodeord"
@@ -56,7 +64,7 @@ msgstr "Delingen er beskyttet af kodeord"
msgid "The password is wrong. Try again."
msgstr "Kodeordet er forkert. Prøv igen."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Kodeord"
@@ -92,15 +100,31 @@ msgstr "deling er deaktiveret"
msgid "For more info, please ask the person who sent this link."
msgstr "For yderligere information, kontakt venligst personen der sendte linket. "
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Download"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkte link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 7f5b387c502e05d43289b3ff2f7756b0748f4c59..ada61f6f603784bbc824ace5aedd53f69ccc4757 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013-2014
-# claus_chr <claus_chr@webspeed.dk>, 2013
-# lodahl <leiflodahl@gmail.com>, 2013
+# Anders J. Sørensen, 2013-2014
+# Claus Christensen <claus_chr@webspeed.dk>, 2013
+# Leif Lodahl <leiflodahl@gmail.com>, 2013
# Ole Holm Frandsen <froksen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "En gyldig adgangskode skal angives"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 4af751f15743e96dd7723b479c7d478f204132a6..b5f5e9797524115f43627ebeda82787d5e3ef953 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013-2014
-# lodahl <leiflodahl@gmail.com>, 2013
+# Anders J. Sørensen, 2013-2014
+# Leif Lodahl <leiflodahl@gmail.com>, 2013
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
# Ole Holm Frandsen <froksen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Slet"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "aldrig"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standard kvote"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Brugernavn"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvote"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 0b0e450aac4f1942cbce695691fddf73aae73b83..327724266745846edb2f99da1f103368355078d3 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013
+# Anders J. Sørensen, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index ea1ffb0a975b302022f3dc2c569f8d86ee942d31..a15668ecea77cdd257fdaa6a764efccba1fa33a0 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sappe, 2013
-# cronner <cronner@gmail.com>, 2012
+# Anders J. Sørensen, 2013
+# Thomas <cronner@gmail.com>, 2012
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Gem"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 079e9b86f212fc169e60ae6d52666263a9d1922b..9f816fd627372288ba4d14f0a5b661d97c2e8cbb 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# Christian Reiner <foss@christian-reiner.info>, 2013
# I Robot, 2013
# I Robot, 2014
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# JamFX <niko@nik-o-mat.de>, 2013
-# ninov <ninovdl@ymail.com>, 2013
+# Nino van der Linden <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# noxin <transifex.com@davidmainzer.com>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -158,51 +158,51 @@ msgstr "Einstellungen"
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "Heute"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "Vor Jahren"
@@ -298,157 +298,165 @@ msgstr "Gutes Passwort"
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Geteilt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Teilen"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fehler beim Ändern der Rechte"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} hat dies mit Dir geteilt"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Link Teilen"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Senden"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Setze ein Ablaufdatum"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Über eine E-Mail teilen:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "erstellen"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "löschen"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "teilen"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Warnung"
@@ -526,12 +534,13 @@ msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/De
msgid "You will receive a link to reset your password via Email."
msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -539,11 +548,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich will mein Passwort jetzt zurücksetzen"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Zurücksetzen"
@@ -556,10 +565,11 @@ msgid "To login page"
msgstr "Zur Login-Seite"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Neues Passwort"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Passwort zurücksetzen"
@@ -693,58 +703,59 @@ msgstr "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bit
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passwort"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Speicher & Datenbank"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Es sind nur %s verfügbar."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Installation abschließen"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Abschließen ..."
@@ -786,19 +797,19 @@ msgstr "Serverseitige Authentifizierung fehlgeschlagen!"
msgid "Please contact your administrator."
msgstr "Bitte kontaktiere Deinen Administrator."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "merken"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index f019e8b57b2415831e8f924afe0bc0767fc0849b..28b929c98ea867aa6120818bd189ed2d9eb9059f 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -7,7 +7,7 @@
# I Robot, 2014
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
-# ninov <ninovdl@ymail.com>, 2013
+# Nino van der Linden <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# kabum <uu.kabum@gmail.com>, 2013
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 65eeff2196a6022d543cf3ab0124c0a57cd56ada..a921128a43239d4f040a94f014b3d0804bd988e7 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,15 +7,15 @@
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# Susi <>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-02 01:54-0400\n"
-"PO-Revision-Date: 2014-06-01 20:31+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,34 +23,42 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Mit Dir geteilt"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Von Dir geteilt"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Es wurden bis jetzt keine Dateien mit Dir geteilt."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Du hast bis jetzt keine Dateien mit anderen geteilt."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Geteilt von "
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "Link"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -59,7 +67,7 @@ msgstr "Diese Freigabe ist durch ein Passwort geschützt"
msgid "The password is wrong. Try again."
msgstr "Bitte überprüfe Dein Passwort und versuche es erneut."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passwort"
@@ -95,15 +103,31 @@ msgstr "Teilen ist deaktiviert"
msgid "For more info, please ask the person who sent this link."
msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkter Link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index ee7796deeb65ae78f004ddae1566f305ab3985fa..7437089420b46c8d8fcfe84d320995961bd9cfa0 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -5,16 +5,16 @@
# Translators:
# I Robot, 2014
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
-# ninov <ninovdl@ymail.com>, 2013
+# Nino van der Linden <ninovdl@ymail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# noxin <transifex.com@davidmainzer.com>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -463,3 +463,8 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Dieser Benutzername existiert bereits"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index f2dce972f529575338d16b2e0f5777e603bd9a71..fe333746fef68e56ab6f2fbc238b47def0ab9002 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# Christian Reiner <foss@christian-reiner.info>, 2013
# I Robot, 2014
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
-# ninov <ninovdl@ymail.com>, 2013
+# Nino van der Linden <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# noxin <transifex.com@davidmainzer.com>, 2013
# nickvergessen <transifex@schilljs.com>, 2014
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -293,15 +293,15 @@ msgstr "Verschlüsselungsschlüssel wiederherstellen."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Löschen nicht möglich"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Fehler beim Erstellen der Gruppe"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Ein gültiger Gruppenname muss angegeben werden"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -329,7 +329,7 @@ msgstr "Löschen"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niemals"
#: js/users/users.js:371
msgid "add group"
@@ -448,14 +448,14 @@ msgstr "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. O
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Info zur Datenbankperformance"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden."
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -747,11 +747,11 @@ msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Nur für spezifizierte Gruppen aktivieren"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -917,27 +917,27 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Nutzer und Gruppen suchen"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Gruppe hinzufügen"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Jeder"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Administratoren"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standard-Quota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -957,15 +957,15 @@ msgstr "Benutzername"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Speicherort"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Letzte Anmeldung"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 3e6e8ad2863d0fd07fa767ba7306c80bccd4f812..db573a6b639efbb4a7d5d0edfa8e46f2f2273501 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "Einstellungen beibehalten?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. - Server"
#: js/settings.js:99
msgid "Cannot add server configuration"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 9b418134062ed721d7401f49618fbd69b4d34b33..2038447e0a9d817e23f76e0d78401ad762073545 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -3,9 +3,9 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mirodin <blobbyjj@ymail.com>, 2012
+# Tristan <blobbyjj@ymail.com>, 2012
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# AndryXY <mibunrui@gmx.de>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# seeed <seeed@freenet.de>, 2012
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,11 +29,11 @@ msgstr "WebDAV Authentifikation"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Adresse:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 10ec52cdeab486d7dd4ec91a47f67771517d1fb0..ca622b9d6510b6f184dfed27e4368e2c862bae63 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Einstellungen"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Freigeben"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Teilung zurücknehmen"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passwort"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 18fa9e6265a0652c5f65f7d17cd1973f465d47a2..4f1583df7b5d90f891f39e9d9c67cad83d3774a8 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index a5f191cc5b780dbfbc92ade5d7b24f714508c34e..605e89e661a268505d87c8e12b17a3da8cd3354f 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passwort"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index fcb470cfa340ea747db2149a357875d59b92fc6b..f621d7ee5ec3a41903ef60e918d1ce706db50b6d 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index c3428b7cbfe60ce5c5dd69e199d88b05b9085676..d23f7faa9d0627bdb3b9d5477891515e3e70f424 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Löschen"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niemals"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index d61a4401f97614fd5fff5e0bcf71363c5d68b3ff..e222c7a346812ff4831cda89cf57ead1485acf63 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_AT/user_webdavauth.po b/l10n/de_AT/user_webdavauth.po
index 2a7f0ce5fa46ac83ae782e83bdfc7edf416a3e7e..9e84bdedda807b25e5493b846f3f9ad31e5a4357 100644
--- a/l10n/de_AT/user_webdavauth.po
+++ b/l10n/de_AT/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index ae7b2ef97a71d080fa04ff305b871dcaf6fc2d35..6ebd10c03f6409f987d2d708327733488b7dc07c 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -3,22 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Christian Reiner <foss@christian-reiner.info>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# I Robot, 2013
-# kenwood <kenwood@gmx.ch>, 2013
+# KenWood <kenwood@gmx.ch>, 2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# SteinQuadrat, 2013
# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -157,51 +157,51 @@ msgstr "Einstellungen"
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "Heute"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "Vor Jahren"
@@ -297,157 +297,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Geteilt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Teilen"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Senden"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "erstellen"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "löschen"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "teilen"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Warnung"
@@ -525,12 +533,13 @@ msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adress
msgid "You will receive a link to reset your password via Email."
msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -538,11 +547,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Zurücksetzen"
@@ -555,10 +564,11 @@ msgid "To login page"
msgstr "Zur Login-Seite"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Neues Passwort"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Passwort zurücksetzen"
@@ -692,58 +702,59 @@ msgstr "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passwort"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Installation abschliessen"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -785,19 +796,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "merken"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 82f9cc0812d0faf7edd83c57106abc47ba9c697f..440e4bd2de79ae77e0113bd4038e1b211fd59629 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# I Robot, 2013
# kabum <uu.kabum@gmail.com>, 2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# SteinQuadrat, 2013
# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index bcb3eb35dc32156cd6744a19c94a31daa8d5bab5..2e2d296154938a55ba69968e60f5c30c0dd9169f 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# FlorianScholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# JamFX <niko@nik-o-mat.de>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Geteilt von"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -56,7 +64,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passwort"
@@ -92,15 +100,31 @@ msgstr "Teilen ist deaktiviert"
msgid "For more info, please ask the person who sent this link."
msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index d999b3e9d1c7b440eed41554d03df3cc0fc53222..532f4d6baf3f1d5cec773a9052989bde93b6e6ea 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# FlorianScholz <work@bgstyle.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 1e66d71658f1367bbbd5a09e61f706daa8b8d715..1802ed0f25ff4785f2d9c9cdb468a71b25b64074 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
-# a.tangemann <a.tangemann@web.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Christian Reiner <foss@christian-reiner.info>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# I Robot, 2013
# kabum <uu.kabum@gmail.com>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -328,7 +328,7 @@ msgstr "Löschen"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niemals"
#: js/users/users.js:371
msgid "add group"
@@ -750,7 +750,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 1bc575568e5d85382239e420526b87478a49c12f..e9f40c75e1e46628dda7c0adba353450cd6656af 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -3,20 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# JamFX <niko@nik-o-mat.de>, 2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
-# multimill <multimill@gmail.com>, 2012
+# Christian <multimill@gmail.com>, 2012
# traductor, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/user_webdavauth.po b/l10n/de_CH/user_webdavauth.po
index 527f08264733bb5cbfd7a90905209d2c0efc44df..411a1ed3be5e7b276e6490834e639cfe9948f1d9 100644
--- a/l10n/de_CH/user_webdavauth.po
+++ b/l10n/de_CH/user_webdavauth.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
-# FlorianScholz <work@bgstyle.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Florian Scholz <work@bgstyle.de>, 2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
-# multimill <multimill@gmail.com>, 2012
+# Christian <multimill@gmail.com>, 2012
# traductor, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 1e8be3ced7b833ea4811a13b414a84538a93c361..b952a033b23ec19932cbf3ce8a2b38ef3e3b06e8 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# Christian Reiner <foss@christian-reiner.info>, 2013
# SteinQuadrat, 2013
# I Robot, 2013
# I Robot, 2014
-# lysathor, 2014
+# Lysathor, 2014
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
# noxin <transifex.com@davidmainzer.com>, 2013-2014
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -158,51 +158,51 @@ msgstr "Einstellungen"
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "Heute"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "Vor Jahren"
@@ -298,157 +298,165 @@ msgstr "Gutes Passwort"
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Geteilt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Teilen"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Link teilen"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Senden"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "erstellen"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "löschen"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "teilen"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Warnung"
@@ -526,12 +534,13 @@ msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adress
msgid "You will receive a link to reset your password via Email."
msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -539,11 +548,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Zurücksetzen"
@@ -556,10 +565,11 @@ msgid "To login page"
msgstr "Zur Login-Seite"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Neues Passwort"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Passwort zurücksetzen"
@@ -693,58 +703,59 @@ msgstr "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>,
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passwort"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Speicher & Datenbank"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Es sind nur %s verfügbar."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Installation abschließen"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Abschließen ..."
@@ -786,19 +797,19 @@ msgstr "Die Authentifizierung auf dem Server ist fehlgeschlagen!"
msgid "Please contact your administrator."
msgstr "Bitte kontaktieren Sie Ihren Administrator."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "merken"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 9681972fe7fec409d4a62e4736e254211c530251..7d7c17c011a03431abec13ef5d1425cbefa6a6f6 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
# SteinQuadrat, 2013
# I Robot, 2013
# I Robot, 2014
@@ -12,14 +12,14 @@
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
# noxin <transifex.com@davidmainzer.com>, 2013-2014
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 23f3a16d4b829a3f45f66a78131f73014a87b6d8..f13876a970ad2e5196e8276f1501a191f8a9f7a0 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-02 01:54-0400\n"
-"PO-Revision-Date: 2014-06-01 20:31+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,34 +22,42 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Mit Ihnen geteilt"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Von Ihnen geteilt"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Es wurden bis jetzt keine Dateien mit Ihnen geteilt."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Sie haben bis jetzt keine Dateien mit anderen geteilt."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Geteilt von"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "Link"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -58,7 +66,7 @@ msgstr "Diese Freigabe ist durch ein Passwort geschützt"
msgid "The password is wrong. Try again."
msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passwort"
@@ -94,15 +102,31 @@ msgstr "Teilen ist deaktiviert"
msgid "For more info, please ask the person who sent this link."
msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkte Verlinkung"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index d3026763b67b4fa266898ab344c0febbae100ce1..6b15891ba6a899168a7f051c8dc60fc4889b4cfe 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -463,3 +463,8 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Der Benutzername existiert bereits"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 0c6722710d76b557a5d7f22a7ca7bbdef656493a..249639e0045b689baf0e886fb03da96fecc5bc26 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
-# montolio <montolio@gmx.at>, 2014
-# arkascha <foss@christian-reiner.info>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Bernhard <montolio@gmx.at>, 2014
+# Christian Reiner <foss@christian-reiner.info>, 2013
# I Robot, 2014
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
# noxin <transifex.com@davidmainzer.com>, 2013-2014
-# Mirodin <blobbyjj@ymail.com>, 2013
+# Tristan <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -293,15 +293,15 @@ msgstr "Verschlüsselungsschlüssel wiederherstellen."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Löschen nicht möglich"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Fehler beim Erstellen der Gruppe"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Ein gültiger Gruppenname muss angegeben werden"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -329,7 +329,7 @@ msgstr "Löschen"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niemals"
#: js/users/users.js:371
msgid "add group"
@@ -448,14 +448,14 @@ msgstr "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. O
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Info zur Datenbankperformance"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden."
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -747,11 +747,11 @@ msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Nur für spezifizierte Gruppen aktivieren"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -917,27 +917,27 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Nutzer und Gruppen suchen"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Gruppe hinzufügen"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Jeder"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Administratoren"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standard-Quota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -957,15 +957,15 @@ msgstr "Benutzername"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Speicherort"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Letzte Anmeldung"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 5e2bd83018f2889f45b5993990a841649a101329..b0d8ad828d5639d0519a3cc558e034904aeb00e7 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# JamFX <niko@nik-o-mat.de>, 2013
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "Einstellungen beibehalten?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. - Server"
#: js/settings.js:99
msgid "Cannot add server configuration"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index b797468cf0ea765dda4e5d112a453fa5f0dd3e00..e92d76ef22422fc9db5852bbb6fb01d1a4ddf14e 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,20 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# a.tangemann <a.tangemann@web.de>, 2013
-# a.tangemann <a.tangemann@web.de>, 2012-2013
+# Andreas Tangemann <a.tangemann@web.de>, 2013
+# Andreas Tangemann <a.tangemann@web.de>, 2012-2013
# Marcel Kühlhorn <tux93@opensuse.org>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
-# multimill <multimill@gmail.com>, 2012
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
+# Christian <multimill@gmail.com>, 2012
# traductor, 2013
# traductor, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,11 +30,11 @@ msgstr "WebDAV-Authentifizierung"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Adresse:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 115ab999188ac4b483d9f75b842e250ea29c101e..feca82a2b0a2764ed6f4f3e9860396abd41b0bdf 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -5,21 +5,21 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
-# pe_ppe <peppe@cs.uoi.gr>, 2014
-# Teogramm <theodorewii121@hotmail.com>, 2013
-# Teogramm <theodorewii121@hotmail.com>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013-2014
-# Wasilis <inactive+Wasilis@transifex.com>, 2013
-# Wasilis <inactive+Wasilis@transifex.com>, 2013
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
+# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
+# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
+# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013-2014
+# Wasilis Mandratzis <inactive+Wasilis@transifex.com>, 2013
+# Wasilis Mandratzis <inactive+Wasilis@transifex.com>, 2013
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -158,51 +158,51 @@ msgstr "Ρυθμίσεις"
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n λεπτό πριν"
msgstr[1] "%n λεπτά πριν"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ώρα πριν"
msgstr[1] "%n ώρες πριν"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "σήμερα"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ημέρα πριν"
msgstr[1] "%n ημέρες πριν"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n μήνας πριν"
msgstr[1] "%n μήνες πριν"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "χρόνια πριν"
@@ -298,157 +298,165 @@ msgstr "Καλό συνθηματικό"
msgid "Strong password"
msgstr "Δυνατό συνθηματικό"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Κοινόχρηστα"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Διαμοιρασμός"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Σφάλμα"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Σφάλμα κατά το σταμάτημα του διαμοιρασμού"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Διαμοιράστηκε με σας από τον {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Διαμοιρασμός με χρήστη ή ομάδα ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Διαμοιρασμός συνδέσμου"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί ερήμην μετά από {days} ημέρες"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Προστασία συνθηματικού"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Επιτρέπεται η Δημόσια Αποστολή"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Αποστολή συνδέσμου με email "
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Αποστολή"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Ορισμός ημ. λήξης"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Ημερομηνία λήξης"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Διαμοιρασμός μέσω email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Δεν βρέθηκε άνθρωπος"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "ομάδα"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Διαμοιρασμός του {item} με τον {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Διακοπή διαμοιρασμού"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "ειδοποίηση με email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Το Email απεστάλη "
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Προειδοποίηση"
@@ -526,12 +534,13 @@ msgstr "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το ema
msgid "You will receive a link to reset your password via Email."
msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Όνομα χρήστη"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -539,11 +548,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Επαναφορά"
@@ -556,10 +565,11 @@ msgid "To login page"
msgstr "Σελίδα εισόδου"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Νέο συνθηματικό"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Επαναφορά συνθηματικού"
@@ -693,58 +703,59 @@ msgstr "Για πληροφορίες πως να ρυθμίσετε ορθά τ
msgid "Create an <strong>admin account</strong>"
msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Αποθήκευση & βάση δεδομένων"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Φάκελος δεδομένων"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Ρύθμιση της βάσης δεδομένων"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Χρήστης της βάσης δεδομένων"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Συνθηματικό βάσης δεδομένων"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Όνομα βάσης δεδομένων"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Κενά Πινάκων Βάσης Δεδομένων"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Διακομιστής βάσης δεδομένων"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Ολοκλήρωση εγκατάστασης"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Ολοκλήρωση..."
@@ -786,19 +797,19 @@ msgstr "Η διαδικασία επικύρωσης απέτυχε από τη
msgid "Please contact your administrator."
msgstr "Παρακαλώ επικοινωνήστε με τον διαχειριστή."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ξεχάσατε το συνθηματικό σας;"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "απομνημόνευση"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Είσοδος"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Εναλλακτικές Συνδέσεις"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index b86f29807d61d29cc2ced7813ce6a037fdcc3ad8..529c411aa90c6b824cbca2427bbb8df10de607f2 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -5,18 +5,18 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# gtsamis <gtsamis@yahoo.com>, 2013
+# Georgios Tsamis <gtsamis@yahoo.com>, 2013
# ggoniotakis <ioannis.goniotakis@gmail.com>, 2014
-# frerisp <petrosfreris@gmail.com>, 2013
-# pe_ppe <peppe@cs.uoi.gr>, 2014
-# vkehayas <vkehayas@gmail.com>, 2013
+# Petros Freris (Πέτρος Φρέρης) <petrosfreris@gmail.com>, 2013
+# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index ed733968cb5f2bba307962b29b5b0060af646ebc..54ee471e7ca594b632513e268448a2d25e1861e0 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -5,14 +5,14 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2014
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013-2014
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 17:12+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Διαμοιρασμένο με εσάς"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Διαμοιρασμένο με άλλους"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Κανένα αρχείο δνε έχει διαμοιραστεί ακόμα με εσάς."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Διαμοιράστηκε από τον {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Διαμοιράστηκε από"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "σύνδεσμος"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό"
@@ -56,7 +64,7 @@ msgstr "Αυτός ο κοινόχρηστος φάκελος προστατεύ
msgid "The password is wrong. Try again."
msgstr "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Κωδικός πρόσβασης"
@@ -92,15 +100,31 @@ msgstr "ο διαμοιρασμός απενεργοποιήθηκε"
msgid "For more info, please ask the person who sent this link."
msgstr "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Λήψη"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Λήψη %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Άμεσος σύνδεσμος"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 207e945ec88ce730bbd2f30efa966e604355ab29..a17316fc17de40afdaa3553f5c2f0a0d3c8ca5b0 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -5,15 +5,15 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2014
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# pe_ppe <peppe@cs.uoi.gr>, 2014
-# vkehayas <vkehayas@gmail.com>, 2013-2014
+# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013-2014
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -462,3 +462,8 @@ msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Το όνομα χρήστη είναι κατειλημμένο"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 3dea2efc5548ce124df566a3f846bfe90745aedc..f53538b163709e63357516786917cd03957320d8 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -5,19 +5,19 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
-# pe_ppe <peppe@cs.uoi.gr>, 2014
-# Teogramm <theodorewii121@hotmail.com>, 2013
-# Teogramm <theodorewii121@hotmail.com>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
+# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
+# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
+# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -328,7 +328,7 @@ msgstr "Διαγραφή"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ποτέ"
#: js/users/users.js:371
msgid "add group"
@@ -750,7 +750,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Όλες"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -924,7 +924,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Ομάδα"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -936,7 +936,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Προεπιλεγμένο Όριο"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -956,7 +956,7 @@ msgstr "Όνομα χρήστη"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Σύνολο Χώρου"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 5b85e2f982c3d85f0b94f5ef021af1ee609da6a4..3ea5132152fdf3a28f10c3b23b6cc4be818b1fa9 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -5,14 +5,14 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2014
# Marios Bekatoros <>, 2013
-# pe_ppe <peppe@cs.uoi.gr>, 2014
-# vkehayas <vkehayas@gmail.com>, 2013-2014
+# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index ef18879d06253583c78b278c75d3fd41ed62e09a..fb80b3e9421da7356bebffa921ef9b7cf60207be 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -9,13 +9,13 @@
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012-2013
# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
# Marios Bekatoros <>, 2013
-# vkehayas <vkehayas@gmail.com>, 2014
+# Vassilis Kehayas <vkehayas@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 2f8bf11d8dbc3f2648963479ff12607de250385a..37220b21b8db34e0b3ae80beb338a8b3e7948e7f 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# lhpalacio <luizhenrique_gomespalacio@hotmail.com>, 2013
+# Luiz Henrique Gomes Palácio <luizhenrique_gomespalacio@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passcode"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 02f8de7e1d3ac6bb31a9f125f12c4e453789d211..f243753ebbc4ecdc2a6546e7df0240c89a87aafe 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# lhpalacio <luizhenrique_gomespalacio@hotmail.com>, 2013
+# Luiz Henrique Gomes Palácio <luizhenrique_gomespalacio@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -18,32 +18,40 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -54,7 +62,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Secret Code"
@@ -90,15 +98,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Download"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 8531252c7ed6109452162feba44bda368d1e740a..7fc571154f3627ccfcda04a02d49a87641004b90 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 5e88d94ca2dd70f58b9e37dfac09953afea9933e..79c0bce668f3385c6b0e1e3b1c3b73c7c029f524 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Settings"
msgid "Saving..."
msgstr "Saving..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "today"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "last month"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "last year"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "years ago"
@@ -288,157 +288,165 @@ msgstr "Good password"
msgid "Strong password"
msgstr "Strong password"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Shared"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Share"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error whilst sharing"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error whilst unsharing"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error whilst changing permissions"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Shared with you and the group {group} by {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Shared with you by {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Share with user or group …"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Share link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "The public link will expire no later than {days} days after it is created"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "By default the public link will expire after {days} days"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Password protect"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Choose a password for the public link"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Allow Public Upload"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Email link to person"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Send"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Set expiration date"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Expiration date"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Share via email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "No people found"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "group"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Resharing is not allowed"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Shared in {item} with {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Unshare"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notify by email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "can edit"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "access control"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "create"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "update"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "delete"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "share"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email sent"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Warning"
@@ -516,12 +524,13 @@ msgstr "Request failed!<br>Did you make sure your email/username was correct?"
msgid "You will receive a link to reset your password via Email."
msgstr "You will receive a link to reset your password via email."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Username"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Yes, I really want to reset my password now"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Reset"
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "To login page"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "New password"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Reset password"
@@ -683,58 +693,59 @@ msgstr "For information how to properly configure your server, please see the <a
msgid "Create an <strong>admin account</strong>"
msgstr "Create an <strong>admin account</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Password"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Storage & database"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Data folder"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configure the database"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Database user"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Database password"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Database name"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Database host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Finish setup"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finishing …"
@@ -776,19 +787,19 @@ msgstr "Server side authentication failed!"
msgid "Please contact your administrator."
msgstr "Please contact your administrator."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Lost your password?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "remember"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Log in"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index b3f63fd2fb1bc3185327ce69a4737d36a4ddcc00..10619ddcfaac7deada11f3f3870aa73fb199d0fe 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index ac6970900d3c2010477a46e829d110c4de183819..bf1d03105375a98112c6c28bdb1dce21da545feb 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 13:36+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Shared with you"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Shared with others"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "No files have been shared with you yet."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "You haven't shared any files yet."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Shared by {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Shared by"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "link"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "This share is password-protected"
@@ -54,7 +62,7 @@ msgstr "This share is password-protected"
msgid "The password is wrong. Try again."
msgstr "The password is wrong. Try again."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Password"
@@ -90,15 +98,31 @@ msgstr "sharing is disabled"
msgid "For more info, please ask the person who sent this link."
msgstr "For more info, please ask the person who sent this link."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Download"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direct link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 63d63efb01682a269f41e025b610dda09c20f2be..a5968afec050498073d71c4bb22c7a3c12c167d4 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "You are accessing the server from an untrusted domain."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr "A valid password must be provided"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "The username is already being used"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 34bd8a14da3e9bc2e1693b3f5d5c458eca16f19b..e268bde468d363c043d998947fece834ea6da00e 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Delete"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "never"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "All"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Group"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index d643dc0c0d5b903699d21c8590b83c15e8c0e489..fb5c649e9f583b5a502077dc58dc082581856d54 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013-2014
+# Darren Richardson <transifex@mnestis.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po
index d604b75536285347d79081c1b03973c51fb10378..cdc56f28533d6ea0ddc0bbd03260676d733467e6 100644
--- a/l10n/en_GB/user_webdavauth.po
+++ b/l10n/en_GB/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# Darren Richardson <transifex@mnestis.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Save"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
index fc7af4d170aa488fe53f79de8555f1872fc9cd38..169aa4396763bdb3d135a218dd57ed05fb8ab901 100644
--- a/l10n/en_NZ/core.po
+++ b/l10n/en_NZ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/en_NZ/files_sharing.po b/l10n/en_NZ/files_sharing.po
index df24267f1793ff9d831f1b6c681875c0aecbf8a6..4a780badd1bd6730637aabd0474c601eeda59da0 100644
--- a/l10n/en_NZ/files_sharing.po
+++ b/l10n/en_NZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: en_NZ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/en_NZ/lib.po b/l10n/en_NZ/lib.po
index fcf5ea5cb2e9bd805981089499f72dc2fd47028e..4175bcf48f67b27f0665cf52692d83c01512c0d8 100644
--- a/l10n/en_NZ/lib.po
+++ b/l10n/en_NZ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: en_NZ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index cc2c21284dc66a8fad4d6a4f57b4374ce5301738..bee5b73cb1f25f397a92cad8b80c4b0f7b6fe94a 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Baptiste <baptiste+transifex@darthenay.fr>, 2013
+# Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2013
# Mariano <mstreet@kde.org.ar>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Agordo"
msgid "Saving..."
msgstr "Konservante..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "antaŭ %n minuto"
msgstr[1] "antaŭ %n minutoj"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "antaŭ %n horo"
msgstr[1] "antaŭ %n horoj"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "antaŭ %n tago"
msgstr[1] "antaŭ %n tagoj"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "antaŭ %n monato"
msgstr[1] "antaŭ %n monatoj"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "lastajare"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -289,157 +289,165 @@ msgstr "Bona pasvorto"
msgid "Strong password"
msgstr "Forta pasvorto"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Dividita"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Eraro"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Eraro dum malkunhavigo"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Eraro dum ŝanĝo de permesoj"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Kunhavigita kun vi de {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Kunhavigi kun uzanto aŭ grupo..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Konhavigi ligilon"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protekti per pasvorto"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Retpoŝti la ligilon al ulo"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Sendi"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Agordi limdaton"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Kunhavigi per retpoŝto:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ne troviĝis gento"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "avizi per retpoŝto"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "krei"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "forigi"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "La retpoŝtaĵo sendiĝis"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Averto"
@@ -517,12 +525,13 @@ msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo
msgid "You will receive a link to reset your password via Email."
msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Uzantonomo"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Jes, mi vere volas restarigi mian pasvorton nun"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Al la ensaluta paĝo"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nova pasvorto"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Rekomenci la pasvorton"
@@ -684,58 +694,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Krei <strong>administran konton</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Pasvorto"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datuma dosierujo"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Agordi la datumbazon"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datumbaza uzanto"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datumbaza pasvorto"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datumbaza nomo"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datumbaza tabelospaco"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datumbaza gastigo"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Fini la instalon"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finante..."
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr "Bonvolu kontakti vian administranton."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ĉu vi perdis vian pasvorton?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "memori"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Ensaluti"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternativaj ensalutoj"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index c27ec7c0aa71e5740ccd50ff47c0950715acf05f..dfa83accd9602e0903b0467e41647c7ae44a41cb 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 5702b881872ee8d1b9ddaa7da771097ccd2663d4..17fae50c6e3852e9e7b05702765529113a821909 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Kunhavigita de {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Kunhavigita de"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ĉi tiu kunhavigo estas protektata per pasvorto"
@@ -54,7 +62,7 @@ msgstr "Ĉi tiu kunhavigo estas protektata per pasvorto"
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Pasvorto"
@@ -90,15 +98,31 @@ msgstr "kunhavigo malkapablas"
msgid "For more info, please ask the person who sent this link."
msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Elŝuti"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkta ligilo"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 0c8849ce0e82b9a0e3708ddc4371edeca1ca499a..e9176bbff0c1a6643b700ec3eb2fc515380881f1 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr "Valida pasvorto devas proviziĝi"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "La uzantonomo jam uzatas"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 4c5a10ace36974ad1e6c474d511980b6e3722e63..8d5c540508b816a130508bfe70cffa8876048e53 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Forigi"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "neniam"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Ĉio"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Defaŭlta kvoto"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Uzantonomo"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvoto"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index b1ce4738138e67138fd6507b8fd1eb6c542cf39a..eed9300dee47f11296fa5a59d7c808cf2ca35e17 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index 82abad467782120036097bba3f44a8e6bc339c28..e015716dda220260eb6c5bc8c4a9265c658cab58 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Konservi"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 73640c250c8c4ff945e089c63e82dcf8a457d7e4..1ad170177ce6a086a7601bfb1821c2427f699fef 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -4,26 +4,26 @@
#
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
-# ggam <ggam@brainleakage.com>, 2013
+# Guillermo G. <ggam@brainleakage.com>, 2013
# I Robot, 2013
# juanman <juanma@kde.org.ar>, 2013-2014
-# msoko <sokolovitch@yahoo.com>, 2013
-# mario.arranz <mario.arranz@gmail.com>, 2014
-# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Marc Sokolovitch <sokolovitch@yahoo.com>, 2013
+# Mario Arranz Florencio <mario.arranz@gmail.com>, 2014
+# Pablo Millaquen <pablomillaquen@gmail.com>, 2013
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
-# saskarip <saskarip@gmail.com>, 2013
-# saskarip <saskarip@gmail.com>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
+# Sam Askari <saskarip@gmail.com>, 2013
+# Sam Askari <saskarip@gmail.com>, 2013
# xsergiolpx <sergioballesterossolanas@gmail.com>, 2014
-# iGerli <stefano@aerosoles.net>, 2013
+# Stefano Gerli <stefano@aerosoles.net>, 2013
# victormce <victormce@gmail.com>, 2014
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -162,51 +162,51 @@ msgstr "Ajustes"
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "hace segundos"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "hace %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "hace %n horas"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoy"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "hace %n días"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "hace %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "hace años"
@@ -302,157 +302,165 @@ msgstr "Contraseña buena"
msgid "Strong password"
msgstr "Contraseña muy buena"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartido"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error al dejar de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido contigo y el grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartido contigo por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartido con el usuario o con el grupo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "El link publico no expirará antes de {days} desde que fué creado"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "El link publico expirará por defecto pasados {days} dias"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Elija una contraseña para el enlace publico"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Enviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar por correo electrónico"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "eliminar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Precaución"
@@ -530,12 +538,13 @@ msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de cor
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -543,11 +552,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sí. Realmente deseo resetear mi contraseña ahora"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Reiniciar"
@@ -560,10 +569,11 @@ msgid "To login page"
msgstr "A la página de inicio de sesión"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nueva contraseña"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Restablecer contraseña"
@@ -697,58 +707,59 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contraseña"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Almacenamiento y base de datos"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Directorio de datos"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finalizando..."
@@ -790,19 +801,19 @@ msgstr "La autenticación a fallado en el servidor."
msgid "Please contact your administrator."
msgstr "Por favor, contacte con el administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "¿Ha perdido su contraseña?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "recordar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Inicios de sesión alternativos"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 8803d00bbde11792eb0b9dd5d0733284f943caf0..44a2f862b63a8fdcc84c3dc9e6b9471ba116f464 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -4,23 +4,23 @@
#
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
-# ggam <ggam@brainleakage.com>, 2013
-# japaol <japaol@gmail.com>, 2013
+# Guillermo G. <ggam@brainleakage.com>, 2013
+# Javi <japaol@gmail.com>, 2013
# joses <jose_mari_s@hotmail.com>, 2014
# juanman <juanma@kde.org.ar>, 2013
-# mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
-# plaguna <laguna.sanchez@gmail.com>, 2014
+# mikel anabitarte <inactive+mikelanabitarte@transifex.com>, 2013
+# Pablo Laguna <laguna.sanchez@gmail.com>, 2014
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
-# qdneren <renanqd@yahoo.com.mx>, 2013
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
-# saskarip <saskarip@gmail.com>, 2013
+# Renan Quezada <renanqd@yahoo.com.mx>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
+# Sam Askari <saskarip@gmail.com>, 2013
# victormce <victormce@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index a6596166783731a98d4bfe4ef6b6c26e9957cc6c..36b14d19a1d195ad8612a180bffcec649932d171 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -6,14 +6,14 @@
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
# Dominique Couot <dcouot@hotmail.com>, 2013
# juanman <juanma@kde.org.ar>, 2013
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-06-01 00:11+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,34 +21,42 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Compartido contigo"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Compartido con otros"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Aún no han compartido contigo ningún archivo."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Aún no has compartido ningún archivo."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartido por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "enlace"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este elemento compartido esta protegido por contraseña"
@@ -57,7 +65,7 @@ msgstr "Este elemento compartido esta protegido por contraseña"
msgid "The password is wrong. Try again."
msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contraseña"
@@ -93,15 +101,31 @@ msgstr "compartir está desactivado"
msgid "For more info, please ask the person who sent this link."
msgstr "Para mayor información, contacte a la persona que le envió el enlace."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Descargar %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Enlace directo"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 992807d82060a9673632d008275b26398398f41c..725b99e0aa6efe2ce2bc7f1fcb9080e8a613fbc0 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -4,21 +4,21 @@
#
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2014
-# Dharth <emilpg@gmail.com>, 2013
-# inye <j.contrerasferrada@gmail.com>, 2014
+# Emilio Plaza García <emilpg@gmail.com>, 2013
+# Javier Contreras <j.contrerasferrada@gmail.com>, 2014
# joses <jose_mari_s@hotmail.com>, 2014
-# mreyesca <mreyesca@luthcueit.onmicrosoft.com>, 2014
-# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Miguel Reyes Canales <mreyesca@luthcueit.onmicrosoft.com>, 2014
+# Pablo Millaquen <pablomillaquen@gmail.com>, 2013
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
# victormce <victormce@gmail.com>, 2014
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Está accediendo al servidor desde un dominio inseguro."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -467,3 +467,8 @@ msgstr "Se debe proporcionar una contraseña válida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "El nombre de usuario ya está en uso"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8fb9e6cebc0cd72129755b9f65e0c48c42d4b599..508cb4b56edb92bd2c30658db1d8b94500efda24 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,27 +5,27 @@
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
# asaez <asaez@asaez.eu>, 2013
-# eadeprado <eadeprado@outlook.com>, 2013
-# ggam <ggam@brainleakage.com>, 2013
-# japaol <japaol@gmail.com>, 2013
-# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# Esther Alvarez de Prado <eadeprado@outlook.com>, 2013
+# Guillermo G. <ggam@brainleakage.com>, 2013
+# Javi <japaol@gmail.com>, 2013
+# Jose Luis <joseluis.tirado@gmail.com>, 2014
# joses <jose_mari_s@hotmail.com>, 2014
# juanman <juanma@kde.org.ar>, 2013-2014
-# mario.arranz <mario.arranz@gmail.com>, 2014
-# plaguna <laguna.sanchez@gmail.com>, 2014
-# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Mario Arranz Florencio <mario.arranz@gmail.com>, 2014
+# Pablo Laguna <laguna.sanchez@gmail.com>, 2014
+# Pablo Millaquen <pablomillaquen@gmail.com>, 2013
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
-# qdneren <renanqd@yahoo.com.mx>, 2013
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
-# saskarip <saskarip@gmail.com>, 2013
-# scambra <sergio@programatica.es>, 2013
+# Renan Quezada <renanqd@yahoo.com.mx>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
+# Sam Askari <saskarip@gmail.com>, 2013
+# Sergio Cambra <sergio@programatica.es>, 2013
# victormce <victormce@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -336,7 +336,7 @@ msgstr "Eliminar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -758,7 +758,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todos"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -932,7 +932,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -944,7 +944,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Cuota predeterminada"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -964,7 +964,7 @@ msgstr "Nombre de usuario"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Cuota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index ff49d2ffea792f11c2cd042f07007673b4406950..ccae2465186a9d57f6b22dea966bcd6f1f90deae 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -5,22 +5,22 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# Art O. Pal <artopal@fastmail.fm>, 2014
-# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# Jose Luis <joseluis.tirado@gmail.com>, 2014
# joses <jose_mari_s@hotmail.com>, 2014
# Maenso <balero_arana@hotmail.com>, 2013
-# plaguna <laguna.sanchez@gmail.com>, 2014
+# Pablo Laguna <laguna.sanchez@gmail.com>, 2014
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
-# ordenet <roberto@ordenet.com>, 2013
-# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
+# Roberto de Miguel <roberto@ordenet.com>, 2013
+# Rodrigo <roirobo@ubuntu.org.ni>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
# victormce <victormce@gmail.com>, 2014
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 16f81949836fcf58d8486344f77d1e0426510dca..51f1765e298a3e8686e74fab183de4606687f4cc 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -5,16 +5,16 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# Art O. Pal <artopal@fastmail.fm>, 2012
-# pggx999 <pggx999@gmail.com>, 2012
-# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
-# Rubén del Campo <yo@rubendelcampo.es>, 2013
-# saskarip <saskarip@gmail.com>, 2013
+# Pablo Gleisner <pggx999@gmail.com>, 2012
+# Rodrigo <roirobo@ubuntu.org.ni>, 2013
+# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
+# Sam Askari <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 1ec8a70974abc69143c69165b76247cd5b006570..69691145483a94fb08b9497aa24d430172d5636a 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Configuración"
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoy"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "años atrás"
@@ -289,157 +289,165 @@ msgstr "Buena contraseña. "
msgid "Strong password"
msgstr "Contraseña fuerte."
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartido"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error en al dejar de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vos y el grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartido con vos por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartir con usuario o grupo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Compartir vínculo"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Proteger con contraseña "
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar el enlace por e-mail."
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Mandar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Asignar fecha de vencimiento"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "borrar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "e-mail mandado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Atención"
@@ -517,12 +525,13 @@ msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de corre
msgid "You will receive a link to reset your password via Email."
msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sí, definitivamente quiero restablecer mi contraseña ahora"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Resetear"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "A la página de inicio de sesión"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nueva contraseña:"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Restablecer contraseña"
@@ -684,58 +694,59 @@ msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contraseña"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Huésped de la base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finalizando..."
@@ -777,19 +788,19 @@ msgstr "¡Falló la autenticación del servidor!"
msgid "Please contact your administrator."
msgstr "Por favor, contacte a su administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "¿Perdiste tu contraseña?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "recordame"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Iniciar sesión"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Nombre alternativos de usuarios"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index a0e124626ee4d0858722fe448d63c062054b7d93..8bae8eeb0122ff12352f93b530b14d7f63bffa34 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -4,15 +4,15 @@
#
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2013-2014
-# juliabis, 2013
+# Julia, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 7dea68fbf15a80d4cb07ddf6475a53d2ccff6cdc..a4967df5b4a715a5cf92b464fd6d0a8fcc5c2b5e 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartido por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esto está protegido por contraseña"
@@ -55,7 +63,7 @@ msgstr "Esto está protegido por contraseña"
msgid "The password is wrong. Try again."
msgstr "La contraseña no es correcta. Probá de nuevo."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contraseña"
@@ -91,15 +99,31 @@ msgstr "compartir está desactivado"
msgid "For more info, please ask the person who sent this link."
msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Vínculo directo"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 94c740ccce8cf35677b86d40c1136548dabd5247..9c8ea9c7d355adeade6b3539df15498f48e2ea97 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Debe ingresar una contraseña válida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 4033191291d13e72c9fedc3a9b8534c6708d6139..77fd02ee8c2a3e1674b5673e136e67aaf3a07118 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -4,15 +4,15 @@
#
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2013-2014
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2014
+# Mariano <koryyyy@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Borrar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todos"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Cuota predeterminada"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Nombre de usuario"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Cuota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index c99a420bd4cabb9167e545772dcb254dad458f35..45dae57d450f74dc579e374dfd35ca374327ca8c 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# cjtess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2013
# cnngimenez, 2014
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2014
+# Mariano <koryyyy@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index f210251ec52f9f1be1ac131c93c59677cbda8f95..43e19d8ffb6e927251e68c3db6bcda4b7f792ec5 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -4,15 +4,15 @@
#
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
-# cjtess <claudio.tessone@gmail.com>, 2013
-# cjtess <claudio.tessone@gmail.com>, 2012
+# CJTess <claudio.tessone@gmail.com>, 2013
+# CJTess <claudio.tessone@gmail.com>, 2012
# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po
index 0619279c4ad2b9ae928a021737fe55e6bedc73a4..a01b9a76be4ec8b98f2d3649267fae7d1c45e94a 100644
--- a/l10n/es_BO/core.po
+++ b/l10n/es_BO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_BO/files_sharing.po b/l10n/es_BO/files_sharing.po
index a454fc401a3b52d7300d11fa2b0ee9772e4e8e33..b9390b68ef59b564b14f3efecf7c19e93dbf6f29 100644
--- a/l10n/es_BO/files_sharing.po
+++ b/l10n/es_BO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_BO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_BO/lib.po b/l10n/es_BO/lib.po
index 695cd85d0958484cadc4822cd54389e7f935ef35..40c5e2770bd50224af119b531beb6795a80f5289 100644
--- a/l10n/es_BO/lib.po
+++ b/l10n/es_BO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_BO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index f5603dd224f43c43116cd53d787adaa965673aab..9070f4486a19123821f573817bc8ff57ccfe8663 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Configuración"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoy"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "mes anterior"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "último año"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "años anteriores"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartido"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Ocurrió un error mientras compartía"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Ocurrió un error mientras dejaba de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Ocurrió un error mientras se cambiaban los permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Usuario"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Clave"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index 6d211872d57d551e612e3478d7863f79cab34f7b..eb545d0c592e0d0ec58129467689b86cc205ca42 100644
--- a/l10n/es_CL/files.po
+++ b/l10n/es_CL/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po
index 601afbb9edd554bd6267a2d556b7a7c8d1c114e7..777af1e35c320206a7a38d6ee3bd4a1c6c0017d8 100644
--- a/l10n/es_CL/files_sharing.po
+++ b/l10n/es_CL/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Clave"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index dfaf500b3ae854fd12c9b1ea85a7400e2ffcd16d..633430cfd7c498d72fb559ef4a9ff10297c1ad73 100644
--- a/l10n/es_CL/lib.po
+++ b/l10n/es_CL/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
index 04e6be2a0a5383a530b28d3bb9159fc671e7403f..451b35e416bbadf6994183aba4eaf24972eb2e02 100644
--- a/l10n/es_CO/core.po
+++ b/l10n/es_CO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po
index 485aa21d5a7a72d73faaf27931c1941258148f25..36f347d7004aa88063d46b710dca2ee8949f077c 100644
--- a/l10n/es_CO/files_sharing.po
+++ b/l10n/es_CO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_CO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_CO/lib.po b/l10n/es_CO/lib.po
index 1773feb4d68f185929823ac5422257e0b6fc66f4..1356c002ee75d0e47d0e9c913cde524986591546 100644
--- a/l10n/es_CO/lib.po
+++ b/l10n/es_CO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_CR/core.po b/l10n/es_CR/core.po
index a4536e9d90b05ee6f84f3fe332735c098ae2ab84..64dd8d3fcaf57e9e50fc328e3e1da339375c26b6 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_CR/files_sharing.po b/l10n/es_CR/files_sharing.po
index 60076b7a37391776966e95a900dc0518aa2c140f..57aa37cd86a5e4296c7be1c5f5f16f3bdbe6c708 100644
--- a/l10n/es_CR/files_sharing.po
+++ b/l10n/es_CR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_CR/lib.po b/l10n/es_CR/lib.po
index 4a78015fa95e4ec9c82dadb2879764a7f15e3b5a..710d62e3a6567687ac553dab607e99055d17b432 100644
--- a/l10n/es_CR/lib.po
+++ b/l10n/es_CR/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
index 299ebc92033a93d3d5c64ddefd549989c8ea23cd..725ea010d2c4181b882fd8f6f2d5f25394b98fc8 100644
--- a/l10n/es_EC/core.po
+++ b/l10n/es_EC/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po
index eec6b301b71bcb12baae07f99d039d08dcfeeb30..60e67993530869169b323485f25b7c630bd625f8 100644
--- a/l10n/es_EC/files_sharing.po
+++ b/l10n/es_EC/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_EC\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_EC/lib.po b/l10n/es_EC/lib.po
index 99fdea7c76592ad4213bec545730e5cdb380b372..4b8ed464c1d62d4409f925be3ca5be7ae1d68a2f 100644
--- a/l10n/es_EC/lib.po
+++ b/l10n/es_EC/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_EC\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 480baab45f8564fd123abf9de33a2aac0bad2d81..29ffe6c69a53d3a609b7685ef3fd81d55edf0bdc 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "Ajustes"
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoy"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "años antes"
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartido"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error al dejar de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido contigo y el grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartido contigo por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartido con el usuario o con el grupo …"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Enviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar al usuario por correo electrónico"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "eliminar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Precaución"
@@ -515,12 +523,13 @@ msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de cor
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sí. Realmente deseo resetear mi contraseña ahora"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Reiniciar"
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr "A la página de inicio de sesión"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nueva contraseña"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Restablecer contraseña"
@@ -682,58 +692,59 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contraseña"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Directorio de datos"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finalizando …"
@@ -775,19 +786,19 @@ msgstr "La autenticación a fallado en el servidor."
msgid "Please contact your administrator."
msgstr "Por favor, contacte con el administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "¿Ha perdido su contraseña?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "recordar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Accesos Alternativos"
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 82e6e7ff84643fad13ae364e3a7368605ebb6124..f6cd07fea609d64f407c7478395624b263af8ebb 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index 05253386c6461219b81c328d9e56f366ca05d048..4535b215c9093d5b86a48fc4c30907ac726a868d 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartido por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este elemento compartido esta protegido por contraseña"
@@ -53,7 +61,7 @@ msgstr "Este elemento compartido esta protegido por contraseña"
msgid "The password is wrong. Try again."
msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contraseña"
@@ -89,15 +97,31 @@ msgstr "compartir está desactivado"
msgid "For more info, please ask the person who sent this link."
msgstr "Para mayor información, contacte a la persona que le envió el enlace."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Enlace directo"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index 73a8c9d792350cb17845de39dc8b267145d53583..851824c0e2a574304e9d27ca6bf47d1d0ed29d4f 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr "Se debe proporcionar una contraseña válida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 747706f1c3778982888f6a4e7264e013b49b87b0..0086b3b4fe1e874dc34a0af91ad327d590001139 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Eliminar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -741,7 +741,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todos"
#: templates/help.php:13
msgid "Administrator Documentation"
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index 9fdf7ea5f1a0f5ac6d2fffe6dc4e5fad93d2f25e..b807760ac7eb28220f38de95d5a4eeb8d5e8809a 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_MX/user_webdavauth.po b/l10n/es_MX/user_webdavauth.po
index 86982f869af9342d3e36b43d02f5bd3e87f10ba8..8cf6408baae9b94ae9d3b4d1b692ee03c97ace63 100644
--- a/l10n/es_MX/user_webdavauth.po
+++ b/l10n/es_MX/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
index 4a60a7c3821b5f49f4aedf0b510e19d6e973647d..77e11e214d36aa3b0126e9e7b211abe3814f2322 100644
--- a/l10n/es_PE/core.po
+++ b/l10n/es_PE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po
index 7de440ee9b87beda3eada623ab3e824a9b5192c4..9df6230080d6ff1d707c1778b363cbbeb14e2c8e 100644
--- a/l10n/es_PE/files_sharing.po
+++ b/l10n/es_PE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_PE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_PE/lib.po b/l10n/es_PE/lib.po
index 3f72b68a56d451005cc21dcfaf165eb0b8eaf819..58f2eac117df193a1b05dce42a78be4b87a7f8e8 100644
--- a/l10n/es_PE/lib.po
+++ b/l10n/es_PE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_PE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_PY/core.po b/l10n/es_PY/core.po
index 86d12feb315fff18c929d53ce77d0e5fe1ddca03..4111b99aac543681954319b8ac28173c8a86f63e 100644
--- a/l10n/es_PY/core.po
+++ b/l10n/es_PY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_PY/files_sharing.po b/l10n/es_PY/files_sharing.po
index c6cf2ebfaf1cb8e528dbec58ea3361fb5fb5d16e..ce83853379441eb4ac6170860e7219e9ba14a803 100644
--- a/l10n/es_PY/files_sharing.po
+++ b/l10n/es_PY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_PY\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_PY/lib.po b/l10n/es_PY/lib.po
index 187d991fe5e189550c3a29b27659027ac9cb0f94..b343fda11a3c78990668f0caea23efc2c708d00f 100644
--- a/l10n/es_PY/lib.po
+++ b/l10n/es_PY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_PY\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_US/core.po b/l10n/es_US/core.po
index 6b2552e7cbfc4049a63d4e2c0f9eed1d13c74342..4937f4ff89a1be835e2ff197e3e2424b40ab39d3 100644
--- a/l10n/es_US/core.po
+++ b/l10n/es_US/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_US/files_sharing.po b/l10n/es_US/files_sharing.po
index fd7d3ed1fb8778212d318d63d1653efd9da6602d..039f63151e9d4463a4b7ee8d2bfcefda1614a78e 100644
--- a/l10n/es_US/files_sharing.po
+++ b/l10n/es_US/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_US\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_US/lib.po b/l10n/es_US/lib.po
index 84256b9ebc6ca2ef2fb2d79e21318fc531f0ef91..665539451c4b7db6e7ee6f8242b3b207b046a0d1 100644
--- a/l10n/es_US/lib.po
+++ b/l10n/es_US/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_US\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po
index 42d1cbc06cbf42ef33d8fbbd94fda428fdd87d7d..c52fe4c3e9f3a056e233c081a953792acc9fe8ac 100644
--- a/l10n/es_UY/core.po
+++ b/l10n/es_UY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po
index edee169182a855a5e598b4a6bedd1a065a5d19c7..581efd1c64af308ec276e115e41ee5042f94f762 100644
--- a/l10n/es_UY/files_sharing.po
+++ b/l10n/es_UY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: es_UY\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/es_UY/lib.po b/l10n/es_UY/lib.po
index f070c3466a9e750c399bbaac3a9460bee82f1e4c..1b6e0bdcf2a9ba31d3f0f077042a9a954a2d4545 100644
--- a/l10n/es_UY/lib.po
+++ b/l10n/es_UY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_UY\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index b724e8ce4780de078869c3e49f680e487a4ab0d6..c14cabb51fcc027589d1f07eecb2620e2f7948aa 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Seaded"
msgid "Saving..."
msgstr "Salvestamine..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut tagasi"
msgstr[1] "%n minutit tagasi"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tund tagasi"
msgstr[1] "%n tundi tagasi"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "täna"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "eile"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päev tagasi"
msgstr[1] "%n päeva tagasi"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuu tagasi"
msgstr[1] "%n kuud tagasi"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "aastat tagasi"
@@ -289,157 +289,165 @@ msgstr "Hea parool"
msgid "Strong password"
msgstr "Väga hea parool"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Jagatud"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Jaga"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Viga"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Viga jagamisel"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Viga jagamise lõpetamisel"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Viga õiguste muutmisel"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Sinuga jagas {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Jaga kasutaja või grupiga ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Jaga linki"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Avalik link aegub vaikimisi pärast {days} päeva"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Parooliga kaitstud"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Vali avaliku lingi jaoks parool"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Luba avalik üleslaadimine"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Saada link isikule e-postiga"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Saada"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Määra aegumise kuupäev"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ühtegi inimest ei leitud"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupp"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "teavita e-postiga"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "loo"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "uuenda"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "kustuta"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "jaga"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-kiri on saadetud"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Hoiatus"
@@ -517,12 +525,13 @@ msgstr "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õ
msgid "You will receive a link to reset your password via Email."
msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Kasutajanimi"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Jah, ma tõesti soovin oma parooli praegu taastada"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Algseaded"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Sisselogimise lehele"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Uus parool"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Nulli parool"
@@ -684,58 +694,59 @@ msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_bl
msgid "Create an <strong>admin account</strong>"
msgstr "Loo <strong>admini konto</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Parool"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Andmehoidla ja andmebaas"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Andmete kaust"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Seadista andmebaasi"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Andmebaasi kasutaja"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Andmebaasi parool"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Andmebasi nimi"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Andmebaasi tabeliruum"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Andmebaasi host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Lõpeta seadistamine"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Lõpetamine ..."
@@ -777,19 +788,19 @@ msgstr "Serveripoolne autentimine ebaõnnestus!"
msgid "Please contact your administrator."
msgstr "Palun kontakteeru oma süsteemihalduriga."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Kaotasid oma parooli?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "pea meeles"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Logi sisse"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatiivsed sisselogimisviisid"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 4dc907f6bcbe139384f2badcf6df294ace958dad..885e6301904a23d3dd4e72979aae06c80b815b52 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 51de5c3234a1ab1dd416527c0b766c315324d313..f908a0626efd2aeb142866441cdd46c385850e18 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Jagas {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Jagas"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "See jagamine on parooliga kaitstud"
@@ -55,7 +63,7 @@ msgstr "See jagamine on parooliga kaitstud"
msgid "The password is wrong. Try again."
msgstr "Parool on vale. Proovi uuesti."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Parool"
@@ -91,15 +99,31 @@ msgstr "jagamine on peatatud"
msgid "For more info, please ask the person who sent this link."
msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Lae alla"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Laadi alla %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Otsene link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index f56875e46c31214caef50c322bb913a30bb4bef1..6b6de2d21c9008f348f13e4cc97df4752e26ec7f 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Sa kasutad serverit usalduseta asukohast"
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Sisesta nõuetele vastav parool"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Kasutajanimi on juba kasutuses"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 0c808d7fd551e4fdd4d4c84d9775cd6fda1efed7..fc6a773442c5ff095e6cb62bd86c904a1050bbcb 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "Kustuta"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "mitte kunagi"
#: js/users/users.js:371
msgid "add group"
@@ -743,7 +743,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Kõik"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -917,7 +917,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupp"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -929,7 +929,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Vaikimisi kvoot"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -949,7 +949,7 @@ msgstr "Kasutajanimi"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Mahupiir"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 4e1f4891e0e8b30d727b74fd0dc9b67c4b46cb82..e79dc09812d6ca606747950ae0028c3cd6a24976 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 02535741b14a70e44921f6e9f1074eeab95addd7..5cb03de0b57f8286f1f9c593dc61bc09c962e398 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Salvesta"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index d3fa1123f015323db363cf9ebf79bf424531d969..1d00e1fcc50bddb3bc17bd2000281c7f5fbb3d57 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -4,14 +4,14 @@
#
# Translators:
# asieriko <asieriko@gmail.com>, 2013
-# Hey_neken <mikel@olasagasti.info>, 2014
+# Mikel Olasagasti Uranga <mikel@olasagasti.info>, 2014
# Piarres Beobide <pi@beobide.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -150,51 +150,51 @@ msgstr "Ezarpenak"
msgid "Saving..."
msgstr "Gordetzen..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "gaur"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "urte"
@@ -290,157 +290,165 @@ msgstr "Pasahitz ona"
msgid "Strong password"
msgstr "Pasahitz sendoa"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Elkarbanatuta"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Errorea"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Errore bat egon da elkarbanaketa desegitean"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Errore bat egon da baimenak aldatzean"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner}-k zurekin elkarbanatuta"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Elkarbanatu lotura"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Gaitu igotze publikoa"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Postaz bidali lotura "
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Bidali"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Ezarri muga data"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "taldea"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "jakinarazi eposta bidez"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "sortu"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "eguneratu"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Eposta bidalia"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Abisua"
@@ -518,12 +526,13 @@ msgstr "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?"
msgid "You will receive a link to reset your password via Email."
msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Erabiltzaile izena"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -531,11 +540,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Bai, nire pasahitza orain berrabiarazi nahi dut"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Berrezarri"
@@ -548,10 +557,11 @@ msgid "To login page"
msgstr "Sarrera orrira"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Pasahitz berria"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Berrezarri pasahitza"
@@ -685,58 +695,59 @@ msgstr "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_
msgid "Create an <strong>admin account</strong>"
msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Pasahitza"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Biltegia & datubasea"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datuen karpeta"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfiguratu datu basea"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datubasearen erabiltzailea"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datubasearen pasahitza"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datubasearen izena"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datu basearen taula-lekua"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datubasearen hostalaria"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Bukatzen..."
@@ -778,19 +789,19 @@ msgstr "Zerbitzari aldeko autentifikazioak huts egin du!"
msgid "Please contact your administrator."
msgstr "Mesedez jarri harremetan zure administradorearekin."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Galdu duzu pasahitza?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "gogoratu"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Hasi saioa"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Beste erabiltzaile izenak"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index f41956581f5ac111eead8c5f47a5b7803869250d..dafaaf38bb5bdb263c0aef2a677a91229a5558bd 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 1695ec5e14d47b17b6075fe8ed4d64a629143eb4..20e16024eb4fed351a9198396e0a43321890244b 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner}-k partekatuta"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Honek elkarbanatuta"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Elkarbanatutako hau pasahitzarekin babestuta dago"
@@ -54,7 +62,7 @@ msgstr "Elkarbanatutako hau pasahitzarekin babestuta dago"
msgid "The password is wrong. Try again."
msgstr "Pasahitza ez da egokia. Saiatu berriro."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Pasahitza"
@@ -90,15 +98,31 @@ msgstr "elkarbanatzea ez dago gaituta"
msgid "For more info, please ask the person who sent this link."
msgstr "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Deskargatu"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Deskargatu %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Lotura zuzena"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index c3f64bd2bd7c189e74b250dc3d2bcd221e4eb239..6937385ea17c7c81a49a4cf419adf64e405fcc82 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Baliozko pasahitza eman behar da"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Erabiltzaile izena dagoeneko erabiltzen ari da"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 0d49893371b4c1a2e9096b60bb4122f6f25d0948..fb1e1b83923a385404aa8c3dec84c34f9c413069 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -4,14 +4,14 @@
#
# Translators:
# asieriko <asieriko@gmail.com>, 2013
-# Debatik mundura!, 2013
+# @atzerritik, 2013
# Piarres Beobide <pi@beobide.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "Ezabatu"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "inoiz"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Denak"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Taldea"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Kuota lehentsia"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "Erabiltzaile izena"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kuota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 4795d4027412b2812da729a923a8516d06466cf1..a2cccdc421e67f6e25226ea734e9c9f9f4b68f03 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index e8828d3981a83a510aa92c94a80e70bbe7237426..6dc55a1574718a00b2e061509a144e331e06fc32 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Gorde"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 34ce426593901e420877071c965eccd73f0e9693..9bb606d916c698814398986d8a25cd7a5d706c5b 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 9f64f38210992e93ae80565a600a9ef4055fea01..e80621d0b6176a77d60fd61352516c38a625be0e 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 7e27f1ea919a9b69600a0507b5bece587698096a..5dc69b79157f4fbeec3760657a77680df3764d59 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Deskargatu"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index f63afbbfa4642fe5b830b04ec83f727bcdc72254..443242d56560c7b99769a363d02897ab83451cc9 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 4d253eb89a9bf887f7b90021f69e7a0d6687d103..cb1f3dcd57423b1a7b025c8b75c851435a76afb5 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu_ES/user_webdavauth.po b/l10n/eu_ES/user_webdavauth.po
index 7a3ccd78fb42daa865a4d931454d4187d51f2b24..2cfc4d3ea34e04ec30ce9a4bbf968591c23db1fa 100644
--- a/l10n/eu_ES/user_webdavauth.po
+++ b/l10n/eu_ES/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Gorde"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index eac5317db2e4d409dcb3ae5dcbe7625fea58523a..5ac41c7f752ab0440d2b7288bd7556d9a5ba31b7 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
-# hajibaba <majid.hajibaba@gmail.com>, 2014
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
+# majid hajibaba <majid.hajibaba@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -149,47 +149,47 @@ msgstr "تنظیمات"
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n دقیقه قبل"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ساعت قبل"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "امروز"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n روز قبل"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ماه قبل"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "سالهای قبل"
@@ -284,157 +284,165 @@ msgstr "رمز عبور خوب"
msgid "Strong password"
msgstr "رمز عبور قوی"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "اشتراک گذاشته شده"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "اشتراکگذاری"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "خطا"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "خطا درحال به اشتراک گذاشتن"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "خطا درحال لغو اشتراک"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "خطا در حال تغییر مجوز"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "اشتراک گذاشتن لینک"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "نگهداری کردن رمز عبور"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "اجازه آپلود عمومی"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "پیوند ایمیل برای شخص."
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "ارسال"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "تنظیم تاریخ انقضا"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "کسی یافت نشد"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "گروه"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "ایجاد"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "به روز"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "درحال ارسال ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "ایمیل ارسال شد"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "اخطار"
@@ -512,12 +520,13 @@ msgstr "درخواست رد شده است !<br> آیا مطمئن هستید ک
msgid "You will receive a link to reset your password via Email."
msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "نام کاربری"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -525,11 +534,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "تنظیم مجدد"
@@ -542,10 +551,11 @@ msgid "To login page"
msgstr "به صفحه ورود"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "گذرواژه جدید"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "دوباره سازی گذرواژه"
@@ -679,58 +689,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "گذرواژه"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "انبارش و پایگاه داده"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "پوشه اطلاعاتی"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "پایگاه داده برنامه ریزی شدند"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "شناسه پایگاه داده"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "پسورد پایگاه داده"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "نام پایگاه داده"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "جدول پایگاه داده"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "هاست پایگاه داده"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "اتمام نصب"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -772,19 +783,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "بیاد آوری"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "ورود"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "ورود متناوب"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index be9035a137b1dba1d6815a16ac98c756e8d4bace..7cb6269b2910fb5e2265d499b75704fac95af758 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
-# S. Wasim Tayyeb, 2014
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
+# wtayyeb, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 22b70f7e34bac35105066c0279ba69a88812923d..3ec93dd6ca25aaf22e5d386b7a619e09c442fda2 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
-# hajibaba <majid.hajibaba@gmail.com>, 2014
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
+# majid hajibaba <majid.hajibaba@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "اشتراک گذارنده {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "اشتراک گذاشته شده به وسیله"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "این اشتراک توسط رمز عبور محافظت می شود"
@@ -55,7 +63,7 @@ msgstr "این اشتراک توسط رمز عبور محافظت می شود"
msgid "The password is wrong. Try again."
msgstr "رمزعبور اشتباه می باشد. دوباره امتحان کنید."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "گذرواژه"
@@ -91,15 +99,31 @@ msgstr "قابلیت اشتراک گذاری غیرفعال است"
msgid "For more info, please ask the person who sent this link."
msgstr "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "دانلود"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "دانلود %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "پیوند مستقیم"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 9c6fbfb3d5b6b34e458f95f8bf2eaa8a63f583b2..520403576476968ea329e26bc501cb4eb401e924 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -454,3 +454,8 @@ msgstr "رمز عبور صحیح باید وارد شود"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 83a549139409952cab640038a32f45871e794ea0..3e00cef9c2a068192fd0f11e5c64ad16f4734855 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
-# hajibaba <majid.hajibaba@gmail.com>, 2014
-# S. Wasim Tayyeb, 2014
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
+# majid hajibaba <majid.hajibaba@gmail.com>, 2014
+# wtayyeb, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:21+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "حذف"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "هرگز"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "همه"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "سهم پیش فرض"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "نام کاربری"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "سهم"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index fbf82fc2736d2a747ba77ea98531f80dec634f60..920098bc33e41192e73c70fa96cb41ede50a9ceb 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 3bb5b13a7047cadddebd83024ce18dec9270b0df..97b8ce10425b455add386dcfc5f9f5cc3480c558 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "ذخیره"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 40feb0d959aefa5291513b34598d44b2de65d01b..13aca045782a0450405353833f51038e88495cf9 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -150,51 +150,51 @@ msgstr "Asetukset"
msgid "Saving..."
msgstr "Tallennetaan..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "tänään"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "vuotta sitten"
@@ -290,157 +290,165 @@ msgstr "Hyvä salasana"
msgid "Strong password"
msgstr "Vahva salasana"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Jaettu"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Jaa"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Virhe"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Virhe jakoa peruttaessa"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Virhe oikeuksia muuttaessa"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Jaa käyttäjän tai ryhmän kanssa…"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Jaa linkki"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Oletuksena julkinen linkki vanhenee {days} päivässä"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Valitse salasana julkiselle linkille"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Salli julkinen lähetys"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Lähetä linkki sähköpostitse"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Lähetä"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Aseta päättymispäivä"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "ryhmä"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "ilmoita sähköpostitse"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "luo"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "päivitä"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "poista"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "jaa"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Sähköposti lähetetty"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Varoitus"
@@ -518,12 +526,13 @@ msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuk
msgid "You will receive a link to reset your password via Email."
msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Käyttäjätunnus"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -531,11 +540,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Kyllä, haluan nollata salasanani nyt"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Nollaa salasana"
@@ -548,10 +557,11 @@ msgid "To login page"
msgstr "Kirjautumissivulle"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Uusi salasana"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Palauta salasana"
@@ -685,58 +695,59 @@ msgstr "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a
msgid "Create an <strong>admin account</strong>"
msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Salasana"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Tallennus ja tietokanta"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datakansio"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Muokkaa tietokantaa"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Vain %s on käytettävissä."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Tietokannan käyttäjä"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Tietokannan salasana"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Tietokannan nimi"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tietokannan taulukkotila"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Tietokantapalvelin"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. "
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Viimeistele asennus"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Valmistellaan…"
@@ -778,19 +789,19 @@ msgstr "Palvelimen puoleinen tunnistautuminen epäonnistui!"
msgid "Please contact your administrator."
msgstr "Ota yhteys ylläpitäjään."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "muista"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Kirjaudu sisään"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Vaihtoehtoiset kirjautumiset"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 6149775cc4f78fcebbd6284325fa7764292e7ada..687f1718b9709ce7a90636dbb6ee5e9f5f3ed465 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -4,15 +4,15 @@
#
# Translators:
# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
-# nahka <nahkaz@gmail.com>, 2014
-# ottok <otto@seravo.fi>, 2014
+# nahkaz <nahkaz@gmail.com>, 2014
+# Otto Kekäläinen <otto@seravo.fi>, 2014
# ioxo <vahakangas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 1d0baccc81ab116205e06992e1a6b8cf8191cbcc..1156bcecabde66246c85f06fc7f7118188e08691 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 11:41+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Jaettu kanssasi"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Jaettu muiden kanssa"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Kukaan ei ole jakanut tiedostoja kanssasi vielä."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Et ole jakanut yhtäkään tiedostoa vielä."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Jakanut {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Jakanut"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "linkki"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Tämä jako on suojattu salasanalla"
@@ -54,7 +62,7 @@ msgstr "Tämä jako on suojattu salasanalla"
msgid "The password is wrong. Try again."
msgstr "Väärä salasana. Yritä uudelleen."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Salasana"
@@ -90,15 +98,31 @@ msgstr "jakaminen on poistettu käytöstä"
msgid "For more info, please ask the person who sent this link."
msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Lataa"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Lataa %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Suora linkki"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 925844417a8321da6f819e76a34665c6ce7e5621..d42d897a46e483e5d54863295370a2cb67898ec4 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -282,7 +282,7 @@ msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa"
#: private/share/share.php:501
#, php-format
msgid "You are not allowed to share %s"
-msgstr ""
+msgstr "Oikeutesi eivät riitä kohteen %s jakamiseen."
#: private/share/share.php:526
#, php-format
@@ -458,3 +458,8 @@ msgstr "Anna kelvollinen salasana"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Käyttäjätunnus on jo käytössä"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 73d4175b3d89c85e504809612cd21eb0fbca5dd6..2401125c1743a82d17856a4166b86361251dcca1 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:51+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -284,15 +284,15 @@ msgstr "Palauta salausavaimet."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Poistaminen epäonnistui"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Virhe ryhmää luotaessa"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Anna kelvollinen ryhmän nimi"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -320,7 +320,7 @@ msgstr "Poista"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ei koskaan"
#: js/users/users.js:371
msgid "add group"
@@ -439,14 +439,14 @@ msgstr ""
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Tietokannan suorituskyvyn tiedot"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan."
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -738,11 +738,11 @@ msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Salli vain tietyille ryhmille"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Kaikki"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -908,27 +908,27 @@ msgstr ""
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Etsi käyttäjiä ja ryhmiä"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Lisää ryhmä"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Ryhmä"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Kaikki"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Ylläpitäjät"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Oletuskiintiö"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,15 +948,15 @@ msgstr "Käyttäjätunnus"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kiintiö"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Tallennustilan sijainti"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Viimeisin kirjautuminen"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 65f950bf0b877bb2db011431ce938d7bfb34d1c7..3a89f4dd7b074a9cb533cbd5872298422ea262ee 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -65,7 +65,7 @@ msgstr "Poisto epäonnistui"
#: js/settings.js:83
msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?"
#: js/settings.js:84
msgid "Keep settings?"
@@ -352,7 +352,7 @@ msgstr ""
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se."
#: templates/settings.php:20
msgid "Connection Settings"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index da866e0fd1f42dfbebcbec4f6c90bd57c3a96223..237f18b2b533a4434004317f1c7d7617d83ad943 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:51+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr "WebDAV-todennus"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Osoite:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Tallenna"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ec4c67e691a4c786a5fa60b8dacf957d4f66c67f..9a0ca2580c341a3e58446fb19ed9fa86d6593573 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -5,19 +5,19 @@
# Translators:
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
-# etiess <etiess@gmail.com>, 2013
+# Etienne <etiess@gmail.com>, 2013
# Gauth <gauthier@openux.org>, 2014
-# msoko <sokolovitch@yahoo.com>, 2013
-# ogre_sympathique, 2013-2014
-# plachance <patlachance@gmail.com>, 2013
-# red0ne <red-0ne@smarty-concept.com>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2013
+# Marc Sokolovitch <sokolovitch@yahoo.com>, 2013
+# Ogre Sympathique, 2013-2014
+# Patrice LACHANCE <patlachance@gmail.com>, 2013
+# Redouane Lakrache <red-0ne@smarty-concept.com>, 2013
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -156,51 +156,51 @@ msgstr "Paramètres"
msgid "Saving..."
msgstr "Enregistrement..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "il y a %n minute"
msgstr[1] "il y a %n minutes"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Il y a %n heure"
msgstr[1] "Il y a %n heures"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "hier"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "il y a %n jour"
msgstr[1] "il y a %n jours"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Il y a %n mois"
msgstr[1] "Il y a %n mois"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -296,157 +296,165 @@ msgstr "Mot de passe de sécurité suffisante"
msgid "Strong password"
msgstr "Mot de passe de forte sécurité"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Partagé"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Partager"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Erreur"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Erreur lors de l'annulation du partage"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Erreur lors du changement des permissions"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partagé par {owner} avec vous et le groupe {group}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Partagé avec vous par {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Partager avec un utilisateur ou un groupe..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Partager le lien"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Ce lien public expirera au plus tard, dans {days} jours après sa création."
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Par défaut, le lien public expire après {days} jour(s)."
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Choisissez un mot de passe pour le lien public."
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Envoyez le lien par email"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Envoyer"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Spécifier la date d'expiration"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "groupe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Notifier par email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "créer"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "supprimer"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "partager"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email envoyé"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Attention"
@@ -524,12 +532,13 @@ msgstr "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateu
msgid "You will receive a link to reset your password via Email."
msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nom d'utilisateur"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -537,11 +546,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Oui, je veux vraiment réinitialiser mon mot de passe maintenant"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Réinitialiser"
@@ -554,10 +563,11 @@ msgid "To login page"
msgstr "Retour à la page d'authentification"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nouveau mot de passe"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
@@ -691,58 +701,59 @@ msgstr "Pour les informations de configuration de votre serveur, veuillez lire l
msgid "Create an <strong>admin account</strong>"
msgstr "Créer un <strong>compte administrateur</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Mot de passe"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Support de stockage & base de données"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Répertoire des données"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurer la base de données"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Utilisateur pour la base de données"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Mot de passe de la base de données"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nom de la base de données"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tablespaces de la base de données"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Serveur de la base de données"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Terminer l'installation"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "En cours de finalisation..."
@@ -784,19 +795,19 @@ msgstr "L'authentification côté serveur a échoué !"
msgid "Please contact your administrator."
msgstr "Veuillez contacter votre administrateur."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Mot de passe perdu ?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "se souvenir de moi"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Connexion"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Logins alternatifs"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 7bfce07076eb40d3c57d6b5b8cff219ee8a448c4..fab11205cf2a74e10ce70fa6f085b474dd9c0a2a 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -5,17 +5,17 @@
# Translators:
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
-# etiess <etiess@gmail.com>, 2013
-# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Etienne <etiess@gmail.com>, 2013
+# Fabian Lemaître <ptit.boogy@gmail.com>, 2014
# Gauth <gauthier@openux.org>, 2014
# MathieuP, 2013
-# ogre_sympathique, 2013
+# Ogre Sympathique, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 8460150f10f09fa4af5d2603658b2bfcfc64c866..5eeb2ac86d94fdfa02a9c0169f55825ad2a7820b 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AlainSanguinetti <alain@sanguinetti.eu>, 2014
+# Alain Sanguinetti <alain@sanguinetti.eu>, 2014
# square <benben390-390@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
-# etiess <etiess@gmail.com>, 2013-2014
-# ogre_sympathique, 2013
+# Etienne <etiess@gmail.com>, 2013-2014
+# Ogre Sympathique, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-02 08:21+0000\n"
-"Last-Translator: AlainSanguinetti <alain@sanguinetti.eu>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,34 +22,42 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Partagé avec vous"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Partagé avec d'autres"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Aucun fichier n'est partagé avec vous pour l'instant"
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Vous ne partagez pas de fichier pour l'instant"
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Partagé par {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Partagé par"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "lien"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ce partage est protégé par un mot de passe"
@@ -58,7 +66,7 @@ msgstr "Ce partage est protégé par un mot de passe"
msgid "The password is wrong. Try again."
msgstr "Le mot de passe est incorrect. Veuillez réessayer."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Mot de passe"
@@ -106,3 +114,19 @@ msgstr "Télécharger %s"
#: templates/public.php:54
msgid "Direct link"
msgstr "Lien direct"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 4b3a492fe80e1a356ffdb4c00ff7c401a8ac84a6..31c8b7d9ad2029fb6a728a3c1a2ca6d0efd77370 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -5,16 +5,16 @@
# Translators:
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
# Cyril Glapa <kyriog@gmail.com>, 2013
-# etiess <etiess@gmail.com>, 2013
-# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Etienne <etiess@gmail.com>, 2013
+# Fabian Lemaître <ptit.boogy@gmail.com>, 2014
# Gauth <gauthier@openux.org>, 2014
-# ogre_sympathique, 2013
+# Ogre Sympathique, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -463,3 +463,8 @@ msgstr "Un mot de passe valide doit être saisi"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Le nom d'utilisateur est déjà utilisé"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ea992e91fd1d34d39cf594e695d4a74c1c2ce1e7..f6ca40a96b38deabc7fa1ea77801b43e71ff4400 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -5,24 +5,24 @@
# Translators:
# 2rock <hub2rock@free.fr>, 2014
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# AlainSanguinetti <alain@sanguinetti.eu>, 2014
+# Alain Sanguinetti <alain@sanguinetti.eu>, 2014
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
-# etiess <etiess@gmail.com>, 2013
-# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Etienne <etiess@gmail.com>, 2013
+# Fabian Lemaître <ptit.boogy@gmail.com>, 2014
# Gauth <gauthier@openux.org>, 2014
-# lyly95, 2013
-# Mystyle <maelvstyle@gmail.com>, 2013
-# ogre_sympathique, 2013-2014
-# red0ne <red-0ne@smarty-concept.com>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2013-2014
+# Lynda AMICHE, 2013
+# Mael <maelvstyle@gmail.com>, 2013
+# Ogre Sympathique, 2013-2014
+# Redouane Lakrache <red-0ne@smarty-concept.com>, 2013
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2013-2014
# tcit <thomas.citharet@gmail.com>, 2014
-# PVince81 <PVince81@owncloud.com>, 2014
+# Vincent Petry <PVince81@owncloud.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -333,7 +333,7 @@ msgstr "Supprimer"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "jamais"
#: js/users/users.js:371
msgid "add group"
@@ -755,7 +755,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Tous"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -929,7 +929,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Groupe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -941,7 +941,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota par défaut"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -961,7 +961,7 @@ msgstr "Nom d'utilisateur"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 7aa805877c7e204c749cf89771b3d2e788965f8c..ea8134d472dc5a5a8ef14c044bb3a926a34a0916 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -4,17 +4,17 @@
#
# Translators:
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
-# etiess <etiess@gmail.com>, 2013
+# Etienne <etiess@gmail.com>, 2013
# Gauth <gauthier@openux.org>, 2014
-# ogre_sympathique, 2014
-# plachance <patlachance@gmail.com>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2014
+# Ogre Sympathique, 2014
+# Patrice LACHANCE <patlachance@gmail.com>, 2013
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 6df030a4d0001a5e8c1c812bc0ef0a785d0857a8..8ee9158bd54a902ea08738d6f46aa70984cf3c85 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -6,16 +6,16 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# mishka, 2013
-# ouafnico <nicolas@shivaserv.fr>, 2012
-# ogre_sympathique, 2013
+# Nicolas R <nicolas@shivaserv.fr>, 2012
+# Ogre Sympathique, 2013
# Robert Di Rosa <>, 2012
# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Sauvegarder"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 982d62909b1852e3ee39c6b984ebd88848f85cd1..4b807e9d6bd9457c8ca0a0b9d58d9431ae209c09 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po
index cef9ff0c63be64f44c2f069cf50c20a62defea95..2f34fa696580446137de3b622612d35ce27fb7ce 100644
--- a/l10n/fr_CA/files_sharing.po
+++ b/l10n/fr_CA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index ff9c96461f08f1aec6d6b19b1c0efefbdb8eaf2c..e690695f372c1aab5cdd7283361432c85c02d48f 100644
--- a/l10n/fr_CA/lib.po
+++ b/l10n/fr_CA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index b137f3e28bd2d92a2212c6bd633472fae24e22a9..2039a027ff1af4e1beec923749c9500528044dc4 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Axustes"
msgid "Saving..."
msgstr "Gardando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
-msgstr[1] "hai %n minutos"
+msgstr[1] "vai %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
-msgstr[1] "hai %n horas"
+msgstr[1] "vai %n horas"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoxe"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "onte"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "hai %n día"
msgstr[1] "vai %n días"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "último mes"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
-msgstr[1] "hai %n meses"
+msgstr[1] "vai %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "último ano"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "anos atrás"
@@ -289,157 +289,165 @@ msgstr "Bo contrasinal"
msgid "Strong password"
msgstr "Contrasinal forte"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
-msgstr "Compartir"
+msgstr "Compartido"
+
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
-#: js/share.js:155
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Produciuse un erro ao deixar de compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Produciuse un erro ao cambiar os permisos"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vostede e co grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartido con vostede por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartir cun usuario ou grupo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Ligazón para compartir"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "A ligazón pública caducará, a máis tardar, {days} días após a súa creación"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "De xeito predeterminado, a ligazón pública caduca aos {days} días"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
-msgstr "Protexido con contrasinais"
+msgstr "Protexido con contrasinal"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Escolla un contrasinal para a ligazón pública"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir o envío público"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar ligazón por correo"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Enviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Definir a data de caducidade"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
-msgstr "Non se permite volver a compartir"
+msgstr "Non se permite volver compartir"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "eliminar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Correo enviado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Aviso"
@@ -477,7 +485,7 @@ msgstr "Actualizando {productName} a versión {version}, isto pode levar un anac
#: js/update.js:43
msgid "Please reload the page."
-msgstr "Volva a cargar a páxina."
+msgstr "Volva cargar a páxina."
#: js/update.js:52
msgid "The update was unsuccessful."
@@ -517,12 +525,13 @@ msgstr "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nome de usuario"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Si, confirmo que quero restabelecer agora o meu contrasinal"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Restabelecer"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "A páxina de conexión"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Novo contrasinal"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Restabelecer o contrasinal"
@@ -684,60 +694,61 @@ msgstr "Para obter información sobre como como configurar axeitadamente o seu s
msgid "Create an <strong>admin account</strong>"
msgstr "Crear unha <strong>contra de administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contrasinal"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Almacenamento e base de datos"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Cartafol de datos"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar a base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Só está dispoñíbel %s."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuario da base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contrasinal da base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nome da base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Táboa de espazos da base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Servidor da base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Rematar a configuración"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
-msgstr "Rematado ..."
+msgstr "Rematando ..."
#: templates/layout.user.php:40
msgid ""
@@ -777,19 +788,19 @@ msgstr "A autenticación fracasou do lado do servidor!"
msgid "Please contact your administrator."
msgstr "Contacte co administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Perdeu o contrasinal?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Conectar"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Accesos alternativos"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0fa5d935f935c77ff81e33621964864b728f629d..f3e3757307e1647eb9ed8670fc15fab8fea373ff 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:11+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -385,7 +385,7 @@ msgstr "Descargar"
#: templates/list.php:92
msgid "Upload too large"
-msgstr "Envío demasiado grande"
+msgstr "Envío grande de máis"
#: templates/list.php:94
msgid ""
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 18333792607b718651fe4ed37fb42e6f44de2582..e08a8dfbe016f23b9c2d440dfaca485925af0505 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:01+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,159 +22,159 @@ msgstr ""
msgid "Local"
msgstr "Local"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Localización"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr "Clave"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr "Secreto"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr "Bucket"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr "Amazon S3 e compatíbeis"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr "Clave de acceso"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr "Clave secreta"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr "Nome de máquina (opcional)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr "Porto (opcional)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr "Rexión (opcional)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr "Activar SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr "Activar o estilo de ruta"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr "Clave da API"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr "Secreto do aplicativo"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
msgid "Host"
msgstr "Servidor"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Nome de usuario"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Contrasinal"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr "Root (raíz)"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
msgstr "ftps:// seguro"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr "ID do cliente"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr "Secreto do cliente"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr "OpenStack Object Storage"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr "Nome de usuario (obrigatorio)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr "Bucket (obrigatorio)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr "Rexión (opcional para OpenStack Object Storage)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr "Clave da API (obrigatoria para Rackspace Cloud Files)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr "Nome do inquilino (obrigatorio para OpenStack Object Storage)"
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr "Contrasinal (obrigatorio para OpenStack Object Storage)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr "Nome do servizo (obrigatorio para OpenStack Object Storage)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)"
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr "Tempo de espera de peticións HTTP en segundos (opcional)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Compartir"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr "SMB / CIFS usando acceso OC"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr "Nome de usuario como compartición"
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
msgid "URL"
msgstr "URL"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
msgstr "https:// seguro"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr "Subcartafol remoto"
@@ -202,29 +202,29 @@ msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
msgid "Saved"
msgstr "Gardado"
-#: lib/config.php:589
+#: lib/config.php:669
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b> "
-#: lib/config.php:599
+#: lib/config.php:679
msgid " and "
msgstr "e"
-#: lib/config.php:621
+#: lib/config.php:701
#, php-format
msgid ""
"<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."
msgstr "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
-#: lib/config.php:623
+#: lib/config.php:703
#, php-format
msgid ""
"<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."
msgstr "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
-#: lib/config.php:625
+#: lib/config.php:705
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -290,8 +290,8 @@ msgstr "Permitirlle aos usuarios montar o seguinte almacenamento externo"
#: templates/settings.php:150
msgid "SSL root certificates"
-msgstr "Certificados SSL root"
+msgstr "Certificados raíz SSL"
#: templates/settings.php:168
msgid "Import Root Certificate"
-msgstr "Importar o certificado root"
+msgstr "Importar o certificado raíz"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 767aa30a712c4d62b16b35f6e90efc4ca0723541..2cec45d952b88708ba871a972a83c4484815befb 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-03 17:41+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Compartido con vostede"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Compartido con outros"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Aínda non hai ficheiros compartidos con vostede."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Aínda non compartiu ningún ficheiro."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartido por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "ligazón"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esta compartición está protexida con contrasinal"
@@ -55,7 +63,7 @@ msgstr "Esta compartición está protexida con contrasinal"
msgid "The password is wrong. Try again."
msgstr "O contrasinal é incorrecto. Ténteo de novo."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contrasinal"
@@ -103,3 +111,19 @@ msgstr "Descargar %s"
#: templates/public.php:54
msgid "Direct link"
msgstr "Ligazón directa"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 90372aa455c4da7c25914853a761195990fa4aa2..1382e5e9eab9765bf8abc49f98ebf21df62a4224 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Esta accedendo desde un dominio non fiábel."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -117,7 +117,7 @@ msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel con est
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados"
+msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta <shipped>true</shipped> que non está permitida para os aplicativos non expedidos"
#: private/installer.php:157
msgid ""
@@ -213,7 +213,7 @@ msgstr "Produciuse un erro na base de datos: «%s»"
#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
#, php-format
msgid "Offending command was: \"%s\""
-msgstr "A orde ofensiva foi: «%s»"
+msgstr "A orde infractora foi: «%s»"
#: private/setup/mysql.php:85
#, php-format
@@ -244,7 +244,7 @@ msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
#: private/setup/oci.php:170 private/setup/oci.php:202
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
+msgstr "A orde infractora foi: «%s», nome: %s, contrasinal: %s"
#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
msgid "PostgreSQL username and/or password not valid"
@@ -262,7 +262,7 @@ msgstr "Estabeleza un contrasinal de administrador"
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
+msgstr "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
#: private/setup.php:165
#, php-format
@@ -363,7 +363,7 @@ msgstr "Non se atopou a infraestrutura de compartición para %s"
#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr "Fallou a compartición de %s, compartición orixinal é do usuario %s"
+msgstr "Fallou a compartición de %s, a compartición orixinal é do usuario %s"
#: private/share/share.php:1397
#, php-format
@@ -459,3 +459,8 @@ msgstr "Debe fornecer un contrasinal"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Este nome de usuario xa está a ser usado"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index feb28c5f52f1128699a31ebfcb47ba47e0eb1a7d..5c7842f6e01b032f0e98e27a9ebbc824f59c7701 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 07:11+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -285,15 +285,15 @@ msgstr "Restaurar as chaves de cifrado."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Non se pode eliminar"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Produciuse un erro ao crear o grupo"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Debe fornecer un nome de grupo"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -321,7 +321,7 @@ msgstr "Eliminar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -440,14 +440,14 @@ msgstr "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou e
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Información do rendemento da base de datos"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -739,11 +739,11 @@ msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></s
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Activar só para grupos específicos"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todo"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -909,27 +909,27 @@ msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Buscar usuarios e grupos"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Engadir un grupo"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Todos"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Administradores"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Cota por omisión"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -949,15 +949,15 @@ msgstr "Nome de usuario"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Cota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Localización do almacenamento"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Último acceso"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 24b712d9395a88ddc9608b2d9d3b7c11dda77127..d58215a6d48a26176e9b82dda1f67f3b4fbf0276 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2014
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
# Xosé M. Lamas <correo.xmgz@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:51+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "Manter os axustes?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. Servidor"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -579,7 +579,7 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
+msgstr "Os nomes de usuario empréganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 8fb764f0ca09f5569964040ea6c806a1cb05d401..c0f0c3864f55f72ce5b90c8ad9d9f91681d4cb7e 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -3,17 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2012
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2014
# Miguel Branco, 2012
# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr "Autenticación WebDAV"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Enderezo:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Gardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 7523d2aa33baa51e8295d7ee3ff4730eaef8cda2..53cca7fc5f53b77ebca79e9d94b653ef4eda6ad1 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# gilshwartz, 2013
+# Gil Shwartz, 2013
# Yaron Shahrabani <sh.yaron@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "הגדרות"
msgid "Saving..."
msgstr "שמירה…"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "לפני %n דקה"
msgstr[1] "לפני %n דקות"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "לפני %n שעה"
msgstr[1] "לפני %n שעות"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "היום"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "לפני %n יום"
msgstr[1] "לפני %n ימים"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "לפני %n חודש"
msgstr[1] "לפני %n חודשים"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "שנים"
@@ -289,157 +289,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "שותף"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "שתף"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "שגיאה"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "שגיאה במהלך השיתוף"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "שגיאה במהלך ביטול השיתוף"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "שגיאה במהלך שינוי ההגדרות"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "שותף אתך ועם הקבוצה {group} שבבעלות {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "שותף אתך על ידי {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "הגנה בססמה"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "שליחת קישור בדוא״ל למשתמש"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "שליחה"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "הגדרת תאריך תפוגה"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "תאריך התפוגה"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "שיתוף באמצעות דוא״ל:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "לא נמצאו אנשים"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "קבוצה"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "אסור לעשות שיתוף מחדש"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} עם {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "יצירה"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "עדכון"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "שיתוף"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "אירעה שגיאה בביטול תאריך התפוגה"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "הודעת הדוא״ל נשלחה"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "אזהרה"
@@ -517,12 +525,13 @@ msgstr "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמ
msgid "You will receive a link to reset your password via Email."
msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "שם משתמש"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "כן, אני רוצה לאפס את הסיסמה שלי עכשיו."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "לדף הכניסה"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "ססמה חדשה"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "איפוס ססמה"
@@ -684,58 +694,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "יצירת <strong>חשבון מנהל</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "סיסמא"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "תיקיית נתונים"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "הגדרת מסד הנתונים"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "שם משתמש במסד הנתונים"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "ססמת מסד הנתונים"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "שם מסד הנתונים"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד הנתונים"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "שרת בסיס נתונים"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "סיום התקנה"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "שכחת את ססמתך?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "כניסה"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "כניסות אלטרנטיביות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 8ba48b6f7094f85a1680f1f5757f43f3858a366d..ef234e111da9799693fc5b09716292bd0c6fe2ba 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# oriez, 2013
+# Ori Even Zahav, 2013
# Yaron Shahrabani <sh.yaron@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 497a60fd8b82ca33b4083f63090d7523e75d48ef..957277094d667e6067e5cdac7fa54b268566e83c 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "שותף בידי {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "שותף על־ידי"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "סיסמא"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "הורדה"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 5ecc6b862b50115e5e263e97dbe5eb9d79847f05..0e4fb63a8be4cc8841ba49e1fcb46129c56156b5 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr "יש לספק ססמה תקנית"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 1e4e1375d292d10cd7d7febf22ebfc0cc08dfdb2..35a408f7fcd3bdb97c4471aff0bfc9c86b0b3d4a 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:21+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "מחיקה"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "לעולם לא"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "הכל"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "קבוצה"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "מכסת בררת המחדל"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "שם משתמש"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "מכסה"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index dac260013ce0d0afe72b2790b98bad4e16651a8e..43256762a30c848c12b848a044793105cb6864f0 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index f805a6cfccd2fba3df317b416356b9f7e67c1fb9..f9191dcf4ddbe0c7a7ab7a8770e61ea19800d2ab 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "שמירה"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 6ef444f4fb66b9e6a64b7af0b97a271d53cd61ac..ae05b443548c0a01e5862f78f9bacf4027cd17c1 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -4,13 +4,13 @@
#
# Translators:
# Debanjum <debanjum@gmail.com>, 2013
-# rktaiwala <rktaiwala@gmail.com>, 2013
+# rahul <rktaiwala@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "सेटिंग्स"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -289,157 +289,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "साझा करें"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "त्रुटि"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "भेजें"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "कोई व्यक्ति नहीं मिले "
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "भेजा जा रहा है"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "ईमेल भेज दिया गया है "
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "चेतावनी "
@@ -517,12 +525,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "प्रयोक्ता का नाम"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "नया पासवर्ड"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -684,58 +694,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "व्यवस्थापक खाता बनाएँ"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "पासवर्ड"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "डाटा फोल्डर"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "डेटाबेस कॉन्फ़िगर करें "
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "डेटाबेस उपयोगकर्ता"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "डेटाबेस पासवर्ड"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "डेटाबेस का नाम"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "सेटअप समाप्त करे"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "याद रखें"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 00949dea1ebfabd3b70d778ab116571575b2e6bf..8da5a8fe65e4f3c09dc8fc1f9bd3876793740e7f 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 092d7b976571830934512ee139edbff19b18a169..ce67292889d99cc22d8fefc5cd77389881ef4ed6 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "द्वारा साझा"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "पासवर्ड"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 1f83fc152d4a5e387efc62a8a28ca1c96c681040..ba73e682c31c7ef7719c87465edb7eb8713ad925 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index ba45fd4e96f1dec21ebacbb9a7c3f0093777de8b..ce147ac57e8b70e3f99d353524dab13c7710962d 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index 08011200a720542258b0e6e51b4fb1c9dfdf1d1f..b6e6084447ae0305e87393f5c3e82621e9c532b2 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "सहेजें"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
index 4bbf48a0f9bb3376531b17aeb73f1ce6be94490e..1dfe9dc2e40f5e0ef64f21903b10cb96c15ccaf5 100644
--- a/l10n/hi_IN/core.po
+++ b/l10n/hi_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hi_IN/files_sharing.po b/l10n/hi_IN/files_sharing.po
index 69ca3dbf30694aab4a7a6aadc273a23bbd1edabb..bfa0ad9aca3f1415cb580c121e31f809dcb0239a 100644
--- a/l10n/hi_IN/files_sharing.po
+++ b/l10n/hi_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/hi_IN/lib.po b/l10n/hi_IN/lib.po
index a1e3977617b22752160b67a9bb5c90da53f02928..36d23eca88de0b5269fc7b96d80209c2fe2e370a 100644
--- a/l10n/hi_IN/lib.po
+++ b/l10n/hi_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index c30f272ffb91552b11ae6e5289c016864f15666f..48726698c2907bc0463769204b01d17fb5c0e6a4 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -147,55 +147,55 @@ msgstr "Postavke"
msgid "Saving..."
msgstr "Spremanje..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "danas"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "godina"
@@ -292,157 +292,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Greška prilikom isključivanja djeljenja"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Greška prilikom promjena prava"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Zaštiti lozinkom"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Postavi datum isteka"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "kreiraj"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "izbriši"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "djeli"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -520,12 +528,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Korisničko ime"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -533,11 +542,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -550,10 +559,11 @@ msgid "To login page"
msgstr "Idi na stranicu za prijavu"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nova lozinka"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Poništavanje lozinke"
@@ -687,58 +697,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Stvori <strong>administratorski račun</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Lozinka"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Mapa baze podataka"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfiguriraj bazu podataka"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Korisnik baze podataka"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Lozinka baze podataka"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Ime baze podataka"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Poslužitelj baze podataka"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Završi postavljanje"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -780,19 +791,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "zapamtiti"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 206c3ece765d60db72cd4428b451c0c2987bcd89..530306ae7fc8e6285f1920c6d2903db2daa6994b 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 98a0b55ea77a231fac2e75b6f909ed38a0669f77..19b6b318eb4b7b36dff19fd0dbdd6dd3d8d492f0 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Lozinka"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Preuzimanje"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 9b39503911c32607f231dc377206cdaaef35d17a..895d0240666ea91a24e6fcebbafc77a7a5975487 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 3ec187a18755b5566f368aa8ab7e12f3503e5133..420a5b47b1cb734e1766966d1ead8dce8c8e2cbc 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Obriši"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nikad"
#: js/users/users.js:371
msgid "add group"
@@ -915,7 +915,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupa"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "standardni kvota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Korisničko ime"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "kvota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index f75dae5c85e5276cf27439201e3d34d79671db45..8a727e9387d69376b5f32ec4a7872328c0ffb03a 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index 4e49f2dc447eb7b1e9c2dd806d2dd6d73d96b4d8..b78ca4a1de45b72070d57f02bb59d30dfa4b168c 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Snimi"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 48141d8f924430f5dd44e2c680c1b309dfeb0cec..6d774edde3925461b286fcb3164959d0470899af 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sherlock79 <inactive+sherlock79@transifex.com>, 2013
+# David Szilagyi <inactive+sherlock79@transifex.com>, 2013
# ebela <bela@dandre.hu>, 2013
-# aries1980 <feher.janos@mindworks.hu>, 2014
+# János Fehér <feher.janos@mindworks.hu>, 2014
# Laszlo Tornoci <torlasz@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -151,51 +151,51 @@ msgstr "Beállítások"
msgid "Saving..."
msgstr "Mentés..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n perccel ezelőtt"
msgstr[1] "%n perccel ezelőtt"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n órával ezelőtt"
msgstr[1] "%n órával ezelőtt"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "ma"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n nappal ezelőtt"
msgstr[1] "%n nappal ezelőtt"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n hónappal ezelőtt"
msgstr[1] "%n hónappal ezelőtt"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "tavaly"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "több éve"
@@ -291,157 +291,165 @@ msgstr "Jó jelszó"
msgid "Strong password"
msgstr "Erős jelszó"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Megosztott"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Hiba"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Nem sikerült visszavonni a megosztást"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Nem sikerült módosítani a jogosultságokat"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Megosztotta Önnel: {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Megosztás hivatkozással"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Válasszon egy jelszót a nyilvános linkhez"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Feltöltést is engedélyezek"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Email címre küldjük el"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Küldjük el"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Legyen lejárati idő"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "csoport"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "email értesítés"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "létrehoz"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "töröl"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "megoszt"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Az emailt elküldtük"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Figyelmeztetés"
@@ -519,12 +527,13 @@ msgstr "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/
msgid "You will receive a link to reset your password via Email."
msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Felhasználónév"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Igen, tényleg meg akarom változtatni a jelszavam"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Visszaállítás"
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "A bejelentkező ablakhoz"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Az új jelszó"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Jelszó-visszaállítás"
@@ -686,58 +696,59 @@ msgstr "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a hre
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Jelszó"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Tárolás és adatbázis"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Adatkönyvtár"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Adatbázis konfigurálása"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Adatbázis felhasználónév"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Adatbázis jelszó"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Az adatbázis neve"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Az adatbázis táblázattér (tablespace)"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Adatbázis szerver"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "A beállítások befejezése"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Befejezés ..."
@@ -779,19 +790,19 @@ msgstr "A szerveroldali hitelesítés sikertelen!"
msgid "Please contact your administrator."
msgstr "Kérjük, lépjen kapcsolatba a rendszergazdával."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Elfelejtette a jelszavát?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "emlékezzen"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Bejelentkezés"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatív bejelentkezés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 85309e2dcc919b049aa4f3ba38de47760a2b0c52..462a671ec7d60ce3abda6ff58b2abd10d6bde46a 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 64769ca70f77a8e79149e68e77e6d0131fef2367..14cc7415762d2c4a519d5f14daa48dd97c8434b9 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Megosztotta: {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Megosztotta Önnel"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ez egy jelszóval védett megosztás"
@@ -54,7 +62,7 @@ msgstr "Ez egy jelszóval védett megosztás"
msgid "The password is wrong. Try again."
msgstr "A megadott jelszó nem megfelelő. Próbálja újra!"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Jelszó"
@@ -90,15 +98,31 @@ msgstr "letiltásra került a megosztás"
msgid "For more info, please ask the person who sent this link."
msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Letöltés"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Közvetlen link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 89ff8ac9172549db07f2e0324d686a7214884021..5d1cc47a74eeb3585b52e8cde704160acd258be2 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sherlock79 <inactive+sherlock79@transifex.com>, 2013
+# David Szilagyi <inactive+sherlock79@transifex.com>, 2013
# ebela <bela@dandre.hu>, 2013
# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -460,3 +460,8 @@ msgstr "Érvényes jelszót kell megadnia"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Ez a bejelentkezési név már foglalt"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index b3d19185adfa1d811ab56971b7dba89af7f6b6d1..570f20ba87c57e0d115e824861255e8030cb4576 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -4,15 +4,15 @@
#
# Translators:
# Adam Toth <adazlord@gmail.com>, 2013
-# sherlock79 <inactive+sherlock79@transifex.com>, 2013
+# David Szilagyi <inactive+sherlock79@transifex.com>, 2013
# ebela <bela@dandre.hu>, 2013-2014
# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Törlés"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "soha"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Mind"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Csoport"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Alapértelmezett kvóta"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Felhasználónév"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 2904c5d31fe3d74b99cd0094b8dd8f64b1a1174c..bbb7f3aef6a39d8171bfd40b02bd5faaec00174e 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 212835631835fb2775310136655f060efc3b844e..5b4f1690af7898019cf8ddb79cfc0b76fb2cdcf9 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# akoscomp <nagy.akos@libreoffice.ro>, 2013
+# Akos <nagy.akos@libreoffice.ro>, 2013
# ebela <bela@dandre.hu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Mentés"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f1ecbcba147eb58ce7b39ca74c494b1a6ab5ed8e..193ff02b115a7f7fa099f59704a4e8ba454cdaa6 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 51d40d5825953a0e73e8703bef7a0084d177aa0e..37bd201d9ec0b89854e0be11b3fc9c1fbf999ea4 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index c82fe5c91bdd9ffa126e2e76afc4beed3ea02fa5..827c244fa2683801ec9b48af1a8d13e9f1c6e2fc 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Բեռնել"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 3cd7530d21f6b93753df51c8e9a6d4f2e2cfacc3..38136d12cbbe4ad5595ab6961181536c271fb58e 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 098b87253ffc3bf019acd74cfb14f6fda05854d0..01a152a6abade056422684eab645fd2e21eb3832 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
index 76a6622332286833af4f7c8e1c37f1a04466202e..60006e3d06b94e9767c8a8a3b41903dcdbc22fa3 100644
--- a/l10n/hy/user_webdavauth.po
+++ b/l10n/hy/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Պահպանել"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 41073e794e4a53d542ecd7183a5d4080ce395723..e83eadee094dabeefa77ccb6fb47e506fd9db849 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Configurationes"
msgid "Saving..."
msgstr "Salveguardante..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "secundas passate"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuta passate"
msgstr[1] "%n minutas passate"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora passate"
msgstr[1] "%n horas passate"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hodie"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "heri"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ultime mense"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ultime anno"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "annos passate"
@@ -288,157 +288,165 @@ msgstr "Contrasigno bon"
msgid "Strong password"
msgstr "Contrasigno forte"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartite"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartir"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error quando on compartiva"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error quando on levava le compartir"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error quando on modificava permissiones"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartite con te e le gruppo {group} per {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartite con te per {owner} "
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartir con usator o gruppo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Compartir ligamine"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protegite per contrasigno"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitter incargamento public"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Ligamine de e-posta a persona"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Invia"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Fixa data de expiration"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de expiration"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartir via e-posta:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Il trovava nulle persona"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "gruppo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Il non es permittite compartir plus que un vice"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartite in {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Leva compartir"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar per message de e-posta"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pote modificar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "controlo de accesso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crear"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualisar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "deler"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartir"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Proteger con contrasigno"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error quando on levava le data de expiration"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error quando on fixava le data de expiration"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Inviante ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Message de e-posta inviate"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Aviso"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nomine de usator"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Re-fixar"
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "al pagina de initio de session"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nove contrasigno"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Reinitialisar contrasigno"
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crear un <strong>conto de administration</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Contrasigno"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Immagazinage & base de datos"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Dossier de datos"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar le base de datos"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usator de base de datos"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Contrasigno de base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nomine de base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Spatio de tabella de base de datos"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Hospite de base de datos"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Terminar configuration"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Terminante ..."
@@ -776,19 +787,19 @@ msgstr "Il falleva authentication de latere servitor!"
msgid "Please contact your administrator."
msgstr "Pro favor continge tu administrator."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Tu perdeva le contrasigno?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "memora"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Aperir session"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Accessos de autorisation alternative"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 95ff3b790be8979459f3e2ccac80456dc5997628..c03d167e7cb493558d24ebee0772a0cb71ac371a 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 26340b6309192bc658b8a3f954258efa6d9a1036..7ee0aaf992ed8ecf87a93d9c103d28679d832ce9 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Contrasigno"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Discargar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 32e3429d36e7d81cfbfd3d1b77da6a8c51887d5b..81c14b7b28676e970a43f709576a726a9f1ae1c9 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 45b8c49e9cbc1ac9a0f8a93e71ed1e8833eada22..28d6c84f9f6f5aabc1b3286c856af83330860047 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Deler"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunquam"
#: js/users/users.js:371
msgid "add group"
@@ -915,7 +915,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota predeterminate"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Nomine de usator"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 777ce2c773ebf315f0e810a244697b038ab52cd4..ac527ce188dfc6483f47514841566046974a87f2 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index c0e1b10c6a0236fa91c6c2a68e2b0fe556a8d35e..2d202795bca4166c41cd3dd0d29077cdf7903486 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Salveguardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 38a14329d498f68745ee72faa486af31b16eeda1..9b06a8f39d872aa0ad9ec36de59ab2fdda490a21 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -148,47 +148,47 @@ msgstr "Pengaturan"
msgid "Saving..."
msgstr "Menyimpan..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n menit yang lalu"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n jam yang lalu"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hari ini"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n hari yang lalu"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n bulan yang lalu"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -283,157 +283,165 @@ msgstr "Sandi baik"
msgid "Strong password"
msgstr "Sandi kuat"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Dibagikan"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Galat"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Galat ketika membatalkan pembagian"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Galat ketika mengubah izin"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Dibagikan dengan anda dan grup {group} oleh {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Dibagikan dengan anda oleh {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Bagikan dengan pengguna atau grup ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Bagikan tautan"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Lindungi dengan sandi"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Izinkan Unggahan Publik"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Emailkan tautan ini ke orang"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Kirim"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Atur tanggal kedaluwarsa"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grup"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notifikasi via email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "dapat sunting"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "buat"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "perbarui"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "hapus"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "bagikan"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Sandi dilindungi"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Galat ketika mengatur tanggal kedaluwarsa"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email terkirim"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Peringatan"
@@ -511,12 +519,13 @@ msgstr "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?"
msgid "You will receive a link to reset your password via Email."
msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nama pengguna"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -524,11 +533,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Atur Ulang"
@@ -541,10 +550,11 @@ msgid "To login page"
msgstr "Ke halaman masuk"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Sandi baru"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Atur ulang sandi"
@@ -678,58 +688,59 @@ msgstr "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan l
msgid "Create an <strong>admin account</strong>"
msgstr "Buat sebuah <strong>akun admin</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Sandi"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Penyimpanan & Basis data"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Folder data"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurasikan basis data"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Pengguna basis data"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Sandi basis data"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nama basis data"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tablespace basis data"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Host basis data"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Selesaikan instalasi"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Menyelesaikan ..."
@@ -771,19 +782,19 @@ msgstr "Otentikasi dari sisi server gagal!"
msgid "Please contact your administrator."
msgstr "Silahkan hubungi administrator anda."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Lupa sandi?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "selalu masuk"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Masuk"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Cara Alternatif untuk Masuk"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index eac12b7fa0d502ae962f066b7499086b406f3a59..4f7c8b54e5f719220584e2f68d068fbcd3198c06 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 0587022d8a37bf3c97d589621a0c2daa02546e3f..3e6d529634196b3a298b2d9d3f18112bd72f7e01 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Dibagikan oleh {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Dibagikan oleh"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Berbagi ini dilindungi sandi"
@@ -54,7 +62,7 @@ msgstr "Berbagi ini dilindungi sandi"
msgid "The password is wrong. Try again."
msgstr "Sandi salah. Coba lagi"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Sandi"
@@ -90,15 +98,31 @@ msgstr "berbagi dinonaktifkan"
msgid "For more info, please ask the person who sent this link."
msgstr "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Unduh"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Tautan langsung"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index f408cde017ad4fd0ea4f9ff24499bd92487a3e68..35e4a76cf72a494411758873a6eb21595570b229 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr "Tuliskan sandi yang valid"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index ff727539da161f62628dacd81ab227151a0da2ea..0ffc38c3b16e7a79e06203ad57000f67c3dc3288 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Hapus"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "tidak pernah"
#: js/users/users.js:371
msgid "add group"
@@ -741,7 +741,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Semua"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -915,7 +915,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grup"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Kuota default"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Nama pengguna"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 3a69d253076114e2abe2d6a9e18581602cd1db05..d8bcdb2912748c2f9ae6d74d5aea56079b251174 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index dad69231cd9a8d5c8cfddb77602b47d25d67de45..edd23b9660e6b8e892faf7a6c01b625fc5f06d36 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -4,13 +4,13 @@
#
# Translators:
# Arif Budiman <arifpedia@gmail.com>, 2014
-# w41l <walecha99@gmail.com>, 2013
+# Widya Walesa <walecha99@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Simpan"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 20cb6b84b0e5a84a5709d2e803d24d02cac26038..1f42008da8dc9437e9c1f8366b2a24c536ba1708 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Stillingar"
msgid "Saving..."
msgstr "Er að vista ..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "í dag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "einhverjum árum"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Deilt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Deila"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Villa"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Villa við deilingu"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Villa við að hætta deilingu"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Villa við að breyta aðgangsheimildum"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Deilt með þér og hópnum {group} af {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Deilt með þér af {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Verja með lykilorði"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Senda vefhlekk í tölvupóstu til notenda"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Senda"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Setja gildistíma"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "mynda"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "uppfæra"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "eyða"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "deila"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistíma"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistíma"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Tölvupóstur sendur"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Aðvörun"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Notendanafn"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "Fara á innskráningarsíðu"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nýtt lykilorð"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Endursetja lykilorð"
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Útbúa <strong>vefstjóra aðgang</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Lykilorð"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Gagnamappa"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Stilla gagnagrunn"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Gagnagrunns notandi"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Gagnagrunns lykilorð"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nafn gagnagrunns"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Töflusvæði gagnagrunns"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Netþjónn gagnagrunns"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Virkja uppsetningu"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Týndir þú lykilorðinu?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "muna eftir mér"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "<strong>Skrá inn</strong>"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index bb0fc5ff1a181370e92fc45fe004864f12fe3e8f..e00856304cc3615422e1cef8cc01bc72ed8e8fbc 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index e52f6c81a146e4fe3d3cbd2820cdbdca9dd579c9..0a623527bb37d0077106b8ec3b5db7c7d7a57677 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Deilt af"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Lykilorð"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Niðurhal"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index fdbb6b3f7f3d3ac803ec0eac203eaedda7cb368f..d42b31fc18762cc4fe440eb4d0fcdccaaf101172 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 2cabd54ed468b6c4c38e236a2e3de8bd137972b5..f8d65dbf88d708a47e231e1337860e9fc089e2ef 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Eyða"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "aldrei"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index bc1380e02ad5f2a38849ec5dcf397e17ede7389e..dad1a6d0b7240690d4b85a72fad4a26f7a69687c 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 1d62e7fcf3c9a77e25e374aa8c6fc59ee328de9b..44075dbe55c55d64ea5baeae0ae942d96091db26 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -4,13 +4,13 @@
#
# Translators:
# Magnus Magnusson <maggiymir@gmail.com>, 2013
-# sveinn <sveinng@gmail.com>, 2012
+# Sveinn G. Gunnarsson <sveinng@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Vista"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index a8f3868d33ff3021f3fd3751131aaaed1bb837f7..f8e76869602d760bdf2ca41e947fde32893b0054 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# nappo <leone@inventati.org>, 2013
+# Leonardo <leone@inventati.org>, 2013
# idetao <marcxosm@gmail.com>, 2013-2014
# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "Database aggiornato"
#: ajax/update.php:24
#, php-format
msgid "Disabled incompatible apps: %s"
-msgstr ""
+msgstr "Applicazione incompatibili disabilitate: %s"
#: avatar/controller.php:69
msgid "No image or file provided"
@@ -151,51 +151,51 @@ msgstr "Impostazioni"
msgid "Saving..."
msgstr "Salvataggio in corso..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "oggi"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "anni fa"
@@ -291,157 +291,165 @@ msgstr "Password buona"
msgid "Strong password"
msgstr "Password forte"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Condivisi"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Condividi"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Errore"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Errore durante la rimozione della condivisione"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Errore durante la modifica dei permessi"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Condiviso con te e con il gruppo {group} da {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Condiviso con te da {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Condividi con utente o gruppo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Condividi collegamento"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Scegli una password per il collegamento pubblico"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Consenti caricamento pubblico"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Invia collegamento via email"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Invia"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Imposta data di scadenza"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "gruppo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notifica tramite email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "creare"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aggiornare"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "elimina"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "condividi"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Messaggio inviato"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Avviso"
@@ -475,7 +483,7 @@ msgstr "Nessuna etichetta selezionata per l'eliminazione."
#: js/update.js:30
msgid "Updating {productName} to version {version}, this may take a while."
-msgstr ""
+msgstr "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo."
#: js/update.js:43
msgid "Please reload the page."
@@ -483,7 +491,7 @@ msgstr "Ricarica la pagina."
#: js/update.js:52
msgid "The update was unsuccessful."
-msgstr ""
+msgstr "L'aggiornamento non è riuscito."
#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
@@ -519,12 +527,13 @@ msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome uten
msgid "You will receive a link to reset your password via Email."
msgstr "Riceverai un collegamento per ripristinare la tua password via email"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nome utente"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sì, voglio davvero ripristinare la mia password adesso"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Ripristina"
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "Alla pagina di accesso"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nuova password"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Ripristina la password"
@@ -686,58 +696,59 @@ msgstr "Per informazioni su come configurare correttamente il tuo server, vedi l
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>account amministratore</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Password"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Archiviazione e database"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Cartella dati"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configura il database"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "È disponibile solo %s."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Utente del database"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Password del database"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nome del database"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Spazio delle tabelle del database"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Host del database"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Termina la configurazione"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Completamento..."
@@ -779,19 +790,19 @@ msgstr "Autenticazione lato server non riuscita!"
msgid "Please contact your administrator."
msgstr "Contatta il tuo amministratore di sistema."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Hai perso la password?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "ricorda"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Accedi"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Accessi alternativi"
@@ -823,26 +834,26 @@ msgstr "Grazie per la pazienza."
#: templates/update.admin.php:3
#, php-format
msgid "%s will be updated to version %s."
-msgstr ""
+msgstr "%s sarà aggiornato alla versione %s."
#: templates/update.admin.php:7
msgid "The following apps will be disabled:"
-msgstr ""
+msgstr "Le seguenti applicazioni saranno disabilitate:"
#: templates/update.admin.php:17
#, php-format
msgid "The theme %s has been disabled."
-msgstr ""
+msgstr "Il tema %s è stato disabilitato."
#: templates/update.admin.php:21
msgid ""
"Please make sure that the database, the config folder and the data folder "
"have been backed up before proceeding."
-msgstr ""
+msgstr "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. "
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "Avvia l'aggiornamento"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ed8e831095a639d7a5bba015c08875b1d4bffd6c..b635efff87f423ef3451c19539abd6a85f1cb0c6 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 15:31+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index f6daf03e62b715de930f28285232307407894637..2d95bbf2b1812e64ed6a6a191b23b97448e01186 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -4,13 +4,13 @@
#
# Translators:
# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Condiviso con te"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Condiviso con altri"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Non è stato ancora condiviso alcun file con te."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
+msgstr "Non hai ancora condiviso alcun file."
+
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Condiviso da {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Condiviso da"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Questa condivione è protetta da password"
@@ -55,7 +63,7 @@ msgstr "Questa condivione è protetta da password"
msgid "The password is wrong. Try again."
msgstr "La password è errata. Prova ancora."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Password"
@@ -65,7 +73,7 @@ msgstr "Nome"
#: templates/list.php:20
msgid "Share time"
-msgstr ""
+msgstr "Tempo di condivisione"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
@@ -91,15 +99,31 @@ msgstr "la condivisione è disabilitata"
msgid "For more info, please ask the person who sent this link."
msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Scarica"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Scarica %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Collegamento diretto"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index f020663a567aa6a810a0fe4a1ecb03e615549010..82697f862587a5b403c7c5a85b97940dfab9609e 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Francesco Capuano <francesco@capu.it>, 2013
+# francesco.capuano.587 <francesco@capu.it>, 2013
# idetao <marcxosm@gmail.com>, 2014
# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Stai accedendo al server da un dominio non affidabile."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Deve essere fornita una password valida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Il nome utente è già utilizzato"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 7d8c8629248b7ab0639f5bd98997b6472bc606b2..911e84955a1a566d2cbd99c8fa18fbb3999b3203 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 16:03+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -287,15 +287,15 @@ msgstr "Ripristina le chiavi di cifratura."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Impossibile eliminare"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Errore durante la creazione del gruppo"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Deve essere fornito un nome valido per il gruppo"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -323,7 +323,7 @@ msgstr "Elimina"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "mai"
#: js/users/users.js:371
msgid "add group"
@@ -432,24 +432,24 @@ msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
msgid ""
"PHP is apparently setup to strip inline doc blocks. This will make several "
"core apps inaccessible."
-msgstr ""
+msgstr "Sembra che PHP sia configurato per rimuovere i blocchi in linea della documentazione. Ciò renderà inaccessibili diverse applicazioni principali."
#: templates/admin.php:94
msgid ""
"This is probably caused by a cache/accelerator such as Zend OPcache or "
"eAccelerator."
-msgstr ""
+msgstr "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator."
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Informazioni prestazioni del database"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -741,11 +741,11 @@ msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></s
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Abilita solo per gruppi specifici"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Tutti"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -911,27 +911,27 @@ msgstr "Digita la password di ripristino per recuperare i file degli utenti dura
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Cerca utenti e gruppi"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Aggiungi gruppo"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Chiunque"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Amministratori"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota predefinita"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,15 +951,15 @@ msgstr "Nome utente"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quote"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Posizione di archiviazione"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Ultimo accesso"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 662218797c0aa912a075ad2015a753727840e381..9747891d01c6aa296d26fdb1e1bf4b511f3f62fa 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 16:03+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "Vuoi mantenere le impostazioni?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. server"
#: js/settings.js:99
msgid "Cannot add server configuration"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index aa65513ce02e637c6fe19a099003b7ba28e149d4..0f72667e42f2b882bc24cc73ca26d15579ea53e4 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -4,14 +4,14 @@
#
# Translators:
# idetao <marcxosm@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 16:03+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr "Autenticazione WebDAV"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Indirizzo:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Salva"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index d51f3e9d21123894a6940b8bd343ad5c9bf00217..e24fab14e984596ff4b97b139a7338510f2b9e6c 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -4,18 +4,18 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
-# plazmism <gomidori@live.jp>, 2013-2014
-# iLikeIT <dj_dark_junglist@yahoo.com>, 2013
+# タカハシ <gomidori@live.jp>, 2013-2014
+# Jake G. <dj_dark_junglist@yahoo.com>, 2013
# Koichi MATSUMOTO <mzch@me.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
-# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013-2014
+# Mika Kobayashi, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -154,47 +154,47 @@ msgstr "設定"
msgid "Saving..."
msgstr "保存中..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "数秒前"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分前"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間前"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "今日"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n日前"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "1ヶ月前"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%nヶ月前"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "1年前"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "数年前"
@@ -259,7 +259,7 @@ msgstr "続ける"
#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
msgid "(all selected)"
-msgstr "(全て選択)"
+msgstr "(すべて選択)"
#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
msgid "({count} selected)"
@@ -289,157 +289,165 @@ msgstr "良好なパスワード"
msgid "Strong password"
msgstr "強いパスワード"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "共有中"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "共有"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "エラー"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "共有でエラー発生"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "共有解除でエラー発生"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "権限変更でエラー発生"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "あなたと {owner} のグループ {group} で共有中"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} と共有中"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "ユーザーもしくはグループと共有 ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "URLで共有"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "公開用リンクは、作成してから {days} 日以内に有効期限切れになります"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "公開用リンクのパスワードを選択"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "アップロードを許可"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "メールリンク"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "送信"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "有効期限を設定"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "グループ"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "メールで通知"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "編集を許可"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "作成"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "アップデート"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "削除"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "共有"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "メールを送信しました"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "警告"
@@ -481,7 +489,7 @@ msgstr "ページをリロードしてください。"
#: js/update.js:52
msgid "The update was unsuccessful."
-msgstr ""
+msgstr "アップデートに失敗しました。"
#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
@@ -517,12 +525,13 @@ msgstr "リクエストに失敗しました！<br>あなたのメール／ユ
msgid "You will receive a link to reset your password via Email."
msgstr "メールでパスワードをリセットするリンクが届きます。"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ユーザー名"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "はい、今すぐパスワードをリセットします。"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "リセット"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "ログインページへ戻る"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "新しいパスワードを入力"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "パスワードをリセット"
@@ -684,58 +694,59 @@ msgstr "サーバーを適正に設定する情報は、こちらの<a href=\"%s
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>管理者アカウント</strong>を作成してください"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "パスワード"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "ストレージとデータベース"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "データフォルダー"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "データベースを設定してください"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "%s のみ有効です。"
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "データベースのユーザー名"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "データベースのパスワード"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "データベース名"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "データベースの表領域"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "データベースのホスト名"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "セットアップを完了します"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "作業を完了しています ..."
@@ -777,19 +788,19 @@ msgstr "サーバーサイドの認証に失敗しました！"
msgid "Please contact your administrator."
msgstr "管理者に問い合わせてください。"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "パスワードを忘れましたか？"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "パスワードを保存"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "ログイン"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "代替ログイン"
@@ -821,7 +832,7 @@ msgstr "しばらくお待ちください。"
#: templates/update.admin.php:3
#, php-format
msgid "%s will be updated to version %s."
-msgstr ""
+msgstr "%s はバージョン %s にアップデートされました。"
#: templates/update.admin.php:7
msgid "The following apps will be disabled:"
@@ -840,7 +851,7 @@ msgstr ""
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "アップデートを開始"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index d622a5f232e2cbabd2309244ccfd0c7491071168..cf8bbda343bc25c42742471abfa4e99d8b631168 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -4,20 +4,20 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
-# plazmism <gomidori@live.jp>, 2013-2014
-# iLikeIT <dj_dark_junglist@yahoo.com>, 2013
+# タカハシ <gomidori@live.jp>, 2013-2014
+# Jake G. <dj_dark_junglist@yahoo.com>, 2013
# Koichi MATSUMOTO <mzch@me.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
-# mikako, 2014
-# pabook <inactive+pabook@transifex.com>, 2013
-# tt yn <tetuyano+transi@gmail.com>, 2013-2014
+# Mika Kobayashi, 2014
+# pabook_32 <inactive+pabook@transifex.com>, 2013
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:41+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使
#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr "目標のフォルダは移動されたか、削除されました。"
+msgstr "対象のフォルダーは移動されたか、削除されました。"
#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
@@ -402,4 +402,4 @@ msgstr "ファイルをスキャンしています、しばらくお待ちくだ
#: templates/list.php:102
msgid "Currently scanning"
-msgstr ""
+msgstr "現在スキャン中"
diff --git a/l10n/ja/files_encryption.po b/l10n/ja/files_encryption.po
index f76735e8b1783b762ddc79fbcc1dc51fe73c011c..faf97f7fb429719a8ec1e437940df846a0bcbb7f 100644
--- a/l10n/ja/files_encryption.po
+++ b/l10n/ja/files_encryption.po
@@ -4,16 +4,16 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013-2014
+# タカハシ <gomidori@live.jp>, 2013-2014
# kuromabo <md81bird@hitaki.net>, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-28 01:54-0400\n"
-"PO-Revision-Date: 2014-05-28 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:31+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr "このファイルを復号化できません、共有ファイルの可
msgid ""
"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。"
-#: hooks/hooks.php:299
+#: hooks/hooks.php:298
msgid "Following users are not set up for encryption:"
msgstr "以下のユーザーは、暗号化設定がされていません："
diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po
index ee254592ea9cfc1bf93b2d380e3c0f5e6aad770b..901dca69525d1df4b45dad35cafec61470c9dbde 100644
--- a/l10n/ja/files_external.po
+++ b/l10n/ja/files_external.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# plazmism <gomidori@live.jp>, 2014
+# タカハシ <gomidori@live.jp>, 2014
# kuromabo <md81bird@hitaki.net>, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:41+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,161 +24,161 @@ msgstr ""
msgid "Local"
msgstr "ローカル"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "位置"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr "キー"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr "シークレットキー"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr "バケット名"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr "Amazon S3 と互換ストレージ"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr "アクセスキー"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr "シークレットキー"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr "ホスト名 (オプション)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr "ポート (オプション)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr "リージョン (オプション)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr "SSLを有効"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr "パス形式を有効"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr "アプリキー"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr "アプリシークレット"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
msgid "Host"
msgstr "ホスト"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "ユーザー名"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "パスワード"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr "ルート"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
msgstr "Secure ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr "クライアントID"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr "クライアント秘密キー"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr "OpenStack Object Storage"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr "ユーザー名 (必須)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr "バケット (必須)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr "リージョン (OpenStack Object Storage用のオプション)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr "APIキー (Rackspace Cloud Filesに必須)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr "テナント名 (OpenStack Object Storage用に必要)"
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr "パスワード (OpenStack Object Storage用に必要)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr "サービス名 (OpenStack Object Storage用に必要)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr "識別用エンドポイントURL (OpenStack Object Storage用に必要)"
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr "HTTPリクエストのタイムアウト秒数 (オプション)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "共有"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr "owncloudログインで SMB/CIFSを使用"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr "共有名"
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
msgid "URL"
msgstr "URL"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
msgstr "セキュア https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr "リモートサブフォルダ"
+msgstr "リモートサブフォルダー"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -204,29 +204,29 @@ msgstr "Googleドライブストレージの設定エラー"
msgid "Saved"
msgstr "保存されました"
-#: lib/config.php:589
+#: lib/config.php:669
msgid "<b>Note:</b> "
msgstr "<b>注意:</b> "
-#: lib/config.php:599
+#: lib/config.php:679
msgid " and "
msgstr "と"
-#: lib/config.php:621
+#: lib/config.php:701
#, php-format
msgid ""
"<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."
msgstr "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。"
-#: lib/config.php:623
+#: lib/config.php:703
#, php-format
msgid ""
"<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."
msgstr "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。"
-#: lib/config.php:625
+#: lib/config.php:705
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -288,7 +288,7 @@ msgstr "ユーザーの外部ストレージを有効にする"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr "ユーザに以下の外部ストレージのマウントを許可する"
+msgstr "ユーザーに以下の外部ストレージのマウントを許可する"
#: templates/settings.php:150
msgid "SSL root certificates"
diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po
index 490d84933d1fa2812a4c4704181fb5709c462071..ddb537702fabc9e5fd8f8e757476f67635b4b314 100644
--- a/l10n/ja/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -4,16 +4,16 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2014
+# タカハシ <gomidori@live.jp>, 2014
# kuromabo <md81bird@hitaki.net>, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-03 18:42+0000\n"
-"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,34 +21,42 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "あなたと共有"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "他人と共有"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "まだ共有を行なっているファイルはありません。"
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "まだ共有を行なっているファイルはありません。"
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} と共有中"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "共有者："
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "リンク"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "この共有はパスワードで保護されています"
@@ -57,7 +65,7 @@ msgstr "この共有はパスワードで保護されています"
msgid "The password is wrong. Try again."
msgstr "パスワードが間違っています。再試行してください。"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "パスワード"
@@ -105,3 +113,19 @@ msgstr "%s をダウンロード"
#: templates/public.php:54
msgid "Direct link"
msgstr "リンク"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index 9db13fe8c74f316d806c35a2339bbcb4e9aa6111..ba848d68040261c698ae53493f8f80e7511ee984 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -4,17 +4,17 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
-# plazmism <gomidori@live.jp>, 2013-2014
+# タカハシ <gomidori@live.jp>, 2013-2014
# Koichi MATSUMOTO <mzch@me.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
-# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013-2014
+# Mika Kobayashi, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
-msgstr "あなたはサーバに、信用が付与されていないドメインからアクセスしています。"
+msgstr "信頼されていないドメインからサーバーにアクセスしています。"
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -367,7 +367,7 @@ msgstr "%s のための共有バックエンドが見つかりません"
#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr "%s の共有に失敗しました。ユーザ %s が元々の共有者であるからです。"
+msgstr "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。"
#: private/share/share.php:1397
#, php-format
@@ -458,4 +458,9 @@ msgstr "有効なパスワードを指定する必要があります"
#: private/user/manager.php:252
msgid "The username is already being used"
-msgstr "ユーザ名はすでに使われています"
+msgstr "ユーザー名はすでに使われています"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 2d8cdc078c8f4bf8cc2e9c2bbba30b3e8854cdca..90e3db51608bf3d42f0d3e6f7962dd9018227fb7 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -4,18 +4,18 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
-# plazmism <gomidori@live.jp>, 2013-2014
-# iLikeIT <dj_dark_junglist@yahoo.com>, 2013
+# タカハシ <gomidori@live.jp>, 2013-2014
+# Jake G. <dj_dark_junglist@yahoo.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
-# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# Mika Kobayashi, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:41+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@ msgstr "保存されました"
#: admin/controller.php:90
msgid "test email settings"
-msgstr "eメール設定をテスト"
+msgstr "メール設定をテスト"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
@@ -289,11 +289,11 @@ msgstr "暗号化キーを復元する。"
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "削除できません"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "グループの作成エラー"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
@@ -325,7 +325,7 @@ msgstr "削除"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "無し"
#: js/users/users.js:371
msgid "add group"
@@ -604,7 +604,7 @@ msgstr "ユーザーにグループ内のユーザーとのみ共有を許可す
#: templates/admin.php:294
msgid "Allow users to send mail notification for shared files"
-msgstr "共有ファイルに関するメール通知の送信をユーザに許可する"
+msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する"
#: templates/admin.php:301
msgid "Exclude groups from sharing"
@@ -649,7 +649,7 @@ msgstr "アドレスから"
#: templates/admin.php:386
msgid "mail"
-msgstr ""
+msgstr "メール"
#: templates/admin.php:407
msgid "Authentication required"
@@ -677,7 +677,7 @@ msgstr "SMTP パスワード"
#: templates/admin.php:428
msgid "Test email settings"
-msgstr "メールテスト設定"
+msgstr "メール設定をテスト"
#: templates/admin.php:429
msgid "Send email"
@@ -743,11 +743,11 @@ msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\">
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "特定のグループのみ有効に"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "すべて"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -913,15 +913,15 @@ msgstr "パスワード変更時のユーザーのファイルを回復するた
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "ユーザーとグループを検索"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "グループを追加"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "グループ"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -929,11 +929,11 @@ msgstr ""
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "管理者"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "デフォルトのクォータサイズ"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -953,15 +953,15 @@ msgstr "ユーザー名"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "クオータ"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "ストレージの場所"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "最終ログイン"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index 104f037f4d8f7fae8af123b18c8d1fe3bffbfd0b..79481a1e46fddc19dbec096118b16b51483c49fa 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -4,17 +4,17 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013-2014
+# タカハシ <gomidori@live.jp>, 2013-2014
# kuromabo <md81bird@hitaki.net>, 2014
-# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013-2014
+# Mika Kobayashi, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:41+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +77,7 @@ msgstr "設定を保持しますか？"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. サーバー"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -105,7 +105,7 @@ msgstr ""
#: js/settings.js:276
msgid "Please specify the port"
-msgstr ""
+msgstr "ポートを指定してください"
#: js/settings.js:780
msgid "Configuration OK"
@@ -169,15 +169,15 @@ msgstr "望ましい機能は見つかりませんでした"
#: settings.php:52
msgid "Server"
-msgstr ""
+msgstr "サーバー"
#: settings.php:53
msgid "User Filter"
-msgstr ""
+msgstr "ユーザーフィルター"
#: settings.php:54
msgid "Login Filter"
-msgstr ""
+msgstr "ログインフィルター"
#: settings.php:55
msgid "Group Filter"
@@ -242,7 +242,7 @@ msgstr "LDAP ユーザー名:"
#: templates/part.wizard-loginfilter.php:16
msgid "LDAP Email Address:"
-msgstr "LDAP メールアドレス:"
+msgstr "LDAPメールアドレス:"
#: templates/part.wizard-loginfilter.php:24
msgid "Other Attributes:"
@@ -257,7 +257,7 @@ msgstr "ログイン実行時に適用するフィルタを定義します。%%u
#: templates/part.wizard-server.php:6
msgid "1. Server"
-msgstr ""
+msgstr "1. Server"
#: templates/part.wizard-server.php:13
#, php-format
@@ -270,7 +270,7 @@ msgstr "サーバー設定を追加"
#: templates/part.wizard-server.php:21
msgid "Delete Configuration"
-msgstr ""
+msgstr "設定を削除"
#: templates/part.wizard-server.php:30
msgid "Host"
@@ -315,7 +315,7 @@ msgstr "拡張タブでユーザーとグループのベースDNを指定する
#: templates/part.wizard-userfilter.php:4
#, php-format
msgid "Limit %s access to users meeting these criteria:"
-msgstr "この基準を満たすユーザに対し %s へのアクセスを制限:"
+msgstr "この基準を満たすユーザーに対し %s へのアクセスを制限:"
#: templates/part.wizard-userfilter.php:31
#, php-format
@@ -392,7 +392,7 @@ msgstr "レプリカサーバーにのみ接続します。"
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
-msgstr "大文字と小文字を区別しない LDAP サーバ (Windows)"
+msgstr "大文字と小文字を区別しないLDAPサーバー (Windows)"
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
@@ -447,7 +447,7 @@ msgstr "グループ表示名のフィールド"
#: templates/settings.php:35
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr "ユーザのグループ表示名の生成に利用するLDAP属性"
+msgstr "ユーザーのグループ表示名の生成に利用するLDAP属性"
#: templates/settings.php:36
msgid "Base Group Tree"
@@ -557,7 +557,7 @@ msgstr "デフォルトでは、UUID 属性は自動的に検出されます。U
#: templates/settings.php:58
msgid "UUID Attribute for Users:"
-msgstr "ユーザーの UUID 属性:"
+msgstr "ユーザーのUUID属性:"
#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
diff --git a/l10n/ja/user_webdavauth.po b/l10n/ja/user_webdavauth.po
index e98965cad9416f17d1f14cc66931483c6263ca98..e774d6c089895f7ad25c58d54d109c612fabc1eb 100644
--- a/l10n/ja/user_webdavauth.po
+++ b/l10n/ja/user_webdavauth.po
@@ -5,15 +5,16 @@
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
-# plazmism <gomidori@live.jp>, 2013
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# タカハシ <gomidori@live.jp>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 17:24+0000\n"
+"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +32,11 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "保存"
#: templates/settings.php:6
msgid ""
"The user credentials will be sent to this address. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr "ユーザーの権限情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
+msgstr "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index 1c2026de7725b2ec41d289fecc5c4dc86e0f8882..7e2b5df0d6569283a72dd4d15bc5e75a9afb5174 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
index 738dbb6afa36c1de3cfea3b8ad6d1540a7ec9401..92762aea3e88d465329d3f5280e32f45bd9093a7 100644
--- a/l10n/jv/files_sharing.po
+++ b/l10n/jv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Njipuk"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
index 04651ec32eb952d870a950fcfd0b92755111ad01..281a0725134d31238aeddbb135bb0dba1522ce29 100644
--- a/l10n/jv/lib.po
+++ b/l10n/jv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index ac6b1069cfded742e7db6e19714840325f3d326d..80c173708f9ea4eb1bc45acc647f191c30fe4826 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr "პარამეტრები"
msgid "Saving..."
msgstr "შენახვა..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "დღეს"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "გასულ თვეში"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ბოლო წელს"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "წლის წინ"
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "გაზიარებული"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "გაზიარება"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "შეცდომა"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "შეცდომა გაზიარების დროს"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "შეცდომა გაზიარების გაუქმების დროს"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "შეცდომა დაშვების ცვლილების დროს"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "გაზიარდა თქვენთვის {owner}–ის მიერ"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "პაროლით დაცვა"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "გაგზავნა"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "მიუთითე ვადის გასვლის დრო"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "ვადის გასვლის დრო"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "გააზიარე მეილზე"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "მომხმარებელი არ არის ნაპოვნი"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "ჯგუფი"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "გაზიარდა {item}–ში {user}–ის მიერ"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "გაუზიარებადი"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "შექმნა"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "განახლება"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "გაზიარება"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "პაროლით დაცული"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "შეცდომა ვადის გასვლის მითითების დროს"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "გაგზავნა ...."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "იმეილი გაიგზავნა"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "გაფრთხილება"
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "მომხმარებლის სახელი"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr "შესვლის გვერდზე"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "ახალი პაროლი"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "პაროლის შეცვლა"
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "შექმენი <strong>ადმინ ექაუნტი</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "პაროლი"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "მონაცემთა საქაღალდე"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "მონაცემთა ბაზის კონფიგურირება"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "მონაცემთა ბაზის მომხმარებელი"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "მონაცემთა ბაზის პაროლი"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "მონაცემთა ბაზის სახელი"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "ბაზის ცხრილის ზომა"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "მონაცემთა ბაზის ჰოსტი"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "კონფიგურაციის დასრულება"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "დაგავიწყდათ პაროლი?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "დამახსოვრება"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "შესვლა"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "ალტერნატიული Login–ი"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 94c7431dd595e6875c861bba6126491e6b648f95..482b201528cf5bfa204de860b61fb8ab0018c725 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 83973d2e1078178171484a30d9107ddcaa505dcb..b1f21a13358ce895aec97a7788dda9199744bac7 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "გაზიარდა {owner} –ის მიერ"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "აზიარებს"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "პაროლი"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ჩამოტვირთვა"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 3c6e96b5233a74a107c91dbe1628e65e8b949195..34430e85b173c9f74833a92164abb80421b6970b 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr "უნდა მიუთითოთ არსებული პარ
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 39bb23333574e5a5ce915f5f667374d429523670..d46825aee0ad3ad7340d44ed37b51272f69c830d 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# drlinux64 <romeo@energo-pro.ge>, 2013
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:21+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "წაშლა"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "არასდროს"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "ყველა"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "საწყისი ქვოტა"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "მომხმარებლის სახელი"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "ქვოტა"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index a259e714068d993761fe30484e5083e7a6990183..513fca4144a790fefa30d2f30b6f6c509e22c904 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index a1fae2870dbb59efd3577dcdb688be952d0ee5bc..fe6220ac0a994dce34b117744b7949dd6eb6aaca 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# drlinux64 <romeo@energo-pro.ge>, 2013
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "შენახვა"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/km/core.po b/l10n/km/core.po
index e5e8ddc30e54c37bc68672173089493acf52dc17..cc9d4a834fc837baef0744b91ed7202a19fd25d0 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -148,47 +148,47 @@ msgstr "ការកំណត់"
msgid "Saving..."
msgstr "កំពុងរក្សាទុក"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "វិនាទីមុន"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n នាទីមុន"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ម៉ោងមុន"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "ថ្ងៃនេះ"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ម្សិលមិញ"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ថ្ងៃមុន"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ខែមុន"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ខែមុន"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ឆ្នាំមុន"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "ឆ្នាំមុន"
@@ -283,157 +283,165 @@ msgstr "ពាក្យសម្ងាត់ល្អ"
msgid "Strong password"
msgstr "ពាក្យសម្ងាត់ខ្លាំង"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "បានចែករំលែក"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "ចែករំលែក"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "កំហុស"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "កំហុសពេលចែករំលែក"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "កំពុងពេលលែងចែករំលែក"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "មានកំហុសនៅពេលប្ដូរសិទ្ធិ"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "បានចែករំលែកជាមួយអ្នក និងក្រុម {group} ដោយ {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "បានចែករំលែកជាមួយអ្នកដោយ {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "ការពារដោយពាក្យសម្ងាត់"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "អនុញ្ញាតការផ្ទុកឡើងជាសាធារណៈ"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "ផ្ញើ"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "កំណត់ពេលផុតកំណត់"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "ពេលផុតកំណត់"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "ចែករំលែកតាមអ៊ីមែល៖"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "រកមិនឃើញមនុស្សណាម្នាក់"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "ក្រុម"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "មិនអនុញ្ញាតឲ្យមានការចែករំលែកឡើងវិញ"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "បានចែករំលែកក្នុង {item} ជាមួយ {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "លែងចែករំលែក"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "អាចកែប្រែ"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "សិទ្ធិបញ្ជា"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "បង្កើត"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ធ្វើបច្ចុប្បន្នភាព"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "លុប"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "ចែករំលែក"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "បានការពារដោយពាក្យសម្ងាត់"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "កំពុងផ្ញើ ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "បានផ្ញើអ៊ីមែល"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "បម្រាម"
@@ -511,12 +519,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ឈ្មោះអ្នកប្រើ"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -524,11 +533,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -541,10 +550,11 @@ msgid "To login page"
msgstr "ទៅទំព័រចូល"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "ពាក្យសម្ងាត់ថ្មី"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត"
@@ -678,58 +688,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "បង្កើត<strong>គណនីអភិបាល</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "ពាក្យសម្ងាត់"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "ឃ្លាំងផ្ទុក & មូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "ថតទិន្នន័យ"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "កំណត់សណ្ឋានមូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "អ្នកប្រើមូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "ពាក្យសម្ងាត់មូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "ឈ្មោះមូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "ម៉ាស៊ីនមូលដ្ឋានទិន្នន័យ"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "បញ្ចប់ការដំឡើង"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "កំពុងបញ្ចប់ ..."
@@ -771,19 +782,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "បាត់ពាក្យសម្ងាត់របស់អ្នក?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "ចងចាំ"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "ចូល"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "ការចូលជំនួស"
diff --git a/l10n/km/files.po b/l10n/km/files.po
index 3f8daad494b553006345b82e7aef884ff95917e2..1874afd6f93dd83ac25f1030b1c0cfd90f7ace1f 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index ef8f30cb94565682d1ecef27ec9a1963f35009b4..3e3de8f1c2e4bd21b5efed62917c67a91014621e 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Pongsametrey SOK <metreysk@gmail.com>, 2014
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Pongsametrey <metreysk@gmail.com>, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} បានចែករំលែក"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "បានចែករំលែកដោយ"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "ការចែករំលែកនេះត្រូវបានការពារដោយពាក្យសម្ងាត់"
@@ -55,7 +63,7 @@ msgstr "ការចែករំលែកនេះត្រូវប
msgid "The password is wrong. Try again."
msgstr "ពាក្យសម្ងាត់ខុសហើយ។ ព្យាយាមម្ដងទៀត។"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "ពាក្យសម្ងាត់"
@@ -91,15 +99,31 @@ msgstr "មិនអនុញ្ញាតការចែករំលែ
msgid "For more info, please ask the person who sent this link."
msgstr "សម្រាប់ព័ត៌មានបន្ថែម សូមសួរអ្នកដែលផ្ញើតំណនេះ។"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ទាញយក"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "ទាញយក %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "តំណផ្ទាល់"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index 2fcafc1ed7756f113eed2b713d4fd4a9605363cd..a03b4e505bbd9953b8a6ce8bbbc071491bdffcfe 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bethborin <borovin38@gmail.com>, 2014
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# beth borin <borovin38@gmail.com>, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -455,3 +455,8 @@ msgstr "ត្រូវផ្ដល់ពាក្យសម្ងាត
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index 831e5013fc5734a9e1e9d6b6299daf618df28580..2e861f030c23cb17bff578b3cf1a6b7d2a02e603 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Pongsametrey SOK <metreysk@gmail.com>, 2014
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Pongsametrey <metreysk@gmail.com>, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "លុប"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "មិនដែរ"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index ba189ba7b5ebaefb2e09247f57cca3e9fe3ba94e..fa27c71ff5955af944d64044c05cdbe3e741a104 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/user_webdavauth.po b/l10n/km/user_webdavauth.po
index 51d0b84871336da1856e18e7fef079fc7565ace3..5fe8410b70512a20c0dd43b9e43905902cb7f4ec 100644
--- a/l10n/km/user_webdavauth.po
+++ b/l10n/km/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# សុវិចិត្រ Sovichet ទេព Tep, 2014
+# Sovichet Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "រក្សាទុក"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 3f2f0edcb52153c7456306993f264f8da05da2cc..ef589e9c7f28b16823bee292fdaefecd5bf64de9 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index b44a9919ae422b23718c8ce1ddf87ae46c162d36..debcc2c8a9fe8b5ee81cbc92b51ceb8ff811373b 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index d57e341096422e79b8bdc550ea98d4577086ddd1..da677762e90caf7b48f5709827bdeb1d8a69ce26 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 64ed1bd180488bce63a66db793590fdf16e8cd75..b8c43060e298c5a2a74a819900bef680711ee38d 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
# Harim Park <fofwisdom@gmail.com>, 2014
-# madeng <jongyoul@gmail.com>, 2013
-# madeng <jongyoul@gmail.com>, 2013
+# Jongyoul Lee <jongyoul@gmail.com>, 2013
+# Jongyoul Lee <jongyoul@gmail.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
# Shinjo Park <kde@peremen.name>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -154,47 +154,47 @@ msgstr "설정"
msgid "Saving..."
msgstr "저장 중..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "초 전"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "오늘"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "어제"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "지난 달"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "작년"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "년 전"
@@ -289,157 +289,165 @@ msgstr "좋은 암호"
msgid "Strong password"
msgstr "강력한 암호"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "공유됨"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "공유"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "오류"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "공유하는 중 오류 발생"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "공유 해제하는 중 오류 발생"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "권한 변경하는 중 오류 발생"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} 님이 공유 중"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "사용자 및 그룹과 공유..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "링크 공유"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "암호 보호"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "공개 업로드 허용"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "이메일 주소"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "전송"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "만료 날짜 설정"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "만료 날짜"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "이메일로 공유:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "발견된 사람 없음"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "그룹"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "다시 공유할 수 없습니다"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}에서 공유 중"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "공유 해제"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "이메일로 알림"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "생성"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "업데이트"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "삭제"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "공유"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "암호로 보호됨"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "만료 날짜 해제 오류"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "만료 날짜 설정 오류"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "전송 중..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "이메일 발송됨"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "경고"
@@ -517,12 +525,13 @@ msgstr "요청이 실패했습니다!<br>이메일 주소와 사용자 이름을
msgid "You will receive a link to reset your password via Email."
msgstr "이메일로 암호 재설정 링크를 보냈습니다."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "사용자 이름"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "예, 지금 내 암호를 재설정합니다"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "재설정"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "로그인 화면으로"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "새 암호"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "암호 재설정"
@@ -684,58 +694,59 @@ msgstr "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_bla
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>관리자 계정</strong> 만들기"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "암호"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "스토리지 & 데이터베이스"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "데이터 폴더"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "데이터베이스 설정"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "데이터베이스 사용자"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "데이터베이스 암호"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "데이터베이스 이름"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "데이터베이스 테이블 공간"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "데이터베이스 호스트"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "설치 완료"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "완료 중 ..."
@@ -777,19 +788,19 @@ msgstr "서버 인증 실패!"
msgid "Please contact your administrator."
msgstr "관리자에게 문의하십시오."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "암호를 잊으셨습니까?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "기억하기"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "로그인"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "대체 로그인"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index e1aaf897b8e806c539b0358d1b34e5fec51c75aa..973ae527a446a5bfc3937b0e11216778b3d01ac4 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
-# ujuc Gang <potopro@gmail.com>, 2013
-# ujuc Gang <potopro@gmail.com>, 2013
-# ujuc Gang <potopro@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# Sungjin Kang <potopro@gmail.com>, 2013
+# Sungjin Kang <potopro@gmail.com>, 2013
+# Sungjin Kang <potopro@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index d81c17dd652ee4e2eaff24c9de8b42352f56957d..61fc790d4c4181aa943011b4f84208ee74731e35 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} 님이 공유함"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "공유한 사용자:"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "이 공유는 암호로 보호되어 있습니다"
@@ -56,7 +64,7 @@ msgstr "이 공유는 암호로 보호되어 있습니다"
msgid "The password is wrong. Try again."
msgstr "암호가 잘못되었습니다. 다시 입력해 주십시오."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "암호"
@@ -92,15 +100,31 @@ msgstr "공유가 비활성화됨"
msgid "For more info, please ask the person who sent this link."
msgstr "자세한 정보는 링크를 보낸 사람에게 문의하십시오."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "다운로드"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "직접 링크"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index f5ae9126277c3a86554914ff7588c299c3978692..fafd8a13ad1e5238638da4b8f00829562c033a84 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
-# chohy <chohy@yahoo.com>, 2013
-# chohy <chohy@yahoo.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
+# Mandy Cho <chohy@yahoo.com>, 2013
+# Mandy Cho <chohy@yahoo.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013-2014
+# woosuk park <bjh13579@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr "올바른 암호를 입력해야 함"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "이 사용자명은 현재 사용중입니다"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index e679b1a7bc45cdcd415bd4cc1fe9d6052f6b5e9e..3fd1c9fca29af9e310cdc6999421d863bde15a26 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
# Harim Park <fofwisdom@gmail.com>, 2014
# Park Shinjo <peremen@gmail.com>, 2013
# Shinjo Park <kde@peremen.name>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -324,7 +324,7 @@ msgstr "삭제"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "없음"
#: js/users/users.js:371
msgid "add group"
@@ -746,7 +746,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "모두"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -932,7 +932,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "기본 할당량"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -952,7 +952,7 @@ msgstr "사용자 이름"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "할당량"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 19e19876d20bcdb20661db8c25284506b271ac57..06f44a7c810e25237726029c5cc2c1b142ee49a3 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# madeng <jongyoul@gmail.com>, 2013
-# madeng <jongyoul@gmail.com>, 2013
+# Jongyoul Lee <jongyoul@gmail.com>, 2013
+# Jongyoul Lee <jongyoul@gmail.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 22ff0a2316d2d49043935aaf25155d6e30a9eb57..eb06f16e9f01aeb86b10dad7ae0a015838616536 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -5,18 +5,18 @@
# Translators:
# aoiob4305 <aoiob4305@gmail.com>, 2013
# aoiob4305 <aoiob4305@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
-# 남자사람 <cessnagi@gmail.com>, 2012
-# 남자사람 <cessnagi@gmail.com>, 2012
+# woosuk park <bjh13579@gmail.com>, 2013
+# youlmu <cessnagi@gmail.com>, 2012
+# youlmu <cessnagi@gmail.com>, 2012
# Shinjo Park <kde@peremen.name>, 2013
# Shinjo Park <kde@peremen.name>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# woosuk park <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "저장"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 127046a6a889cddba7154581bdb4c6531278ba66..5722aceded36912ef2b3dea258698d5ced23448d 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "دهستكاری"
msgid "Saving..."
msgstr "پاشکهوتدهکات..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "ههڵه"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "ئاگاداری"
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ناوی بهکارهێنهر"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "وشەی نهێنی نوێ"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "دووباره كردنهوهی وشهی نهێنی"
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "وشەی تێپەربو"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "زانیاری فۆڵدهر"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "بهكارهێنهری داتابهیس"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "وشهی نهێنی داتا بهیس"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "ناوی داتابهیس"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "هۆستی داتابهیس"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "كۆتایی هات دهستكاریهكان"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index c2365f0f2a1bf700179c0c685f99220fcd554e32..68f9cc422e50cbd213a84f2b7f2020c5b029a6d6 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 4bf1d8b04ba1d1a9890aba3d78a02d31b0b55e78..be622fe37c538731b296f22e622f960dd9c98ae2 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "داگرتن"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 0298c9022d057ab09834e3b4bf1cd10051e3c968..1a9c852b7a490b436ca9f9abc0bdd905eb84e1d4 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 78044ab56ef001c679aff6a187d61142661343fc..bd7e412a37af66c0b682f2d7b5f94f9a0f078408 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index fd451e3be2527e3a74fef76098a2da5ffb0f19ee..98da4d2b3cebc4bb69254e488c6ec8f6ae5d7575 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "پاشکهوتکردن"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 7fd8485d753e671017304e24e1501edaaab7c92d..63b499d96aca67fc246dd45dcca012c1b70d2d0d 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Michel Weimerskirch <michel@weimerskirch.net>, 2013
+# michel.weimerskirch <michel@weimerskirch.net>, 2013
# sim0n <sim0n@trypill.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Astellungen"
msgid "Saving..."
msgstr "Speicheren..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n Minutt hir"
msgstr[1] "%n Minutten hir"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "haut"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "Joren hir"
@@ -289,157 +289,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Gedeelt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Deelen"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Feeler"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Feeler beim Annuléiere vum Deelen"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Feeler beim Ännere vun de Rechter"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Gedeelt mat dir vum {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Link deelen"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passwuertgeschützt"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Ëffentlechen Upload erlaaben"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Link enger Persoun mailen"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Schécken"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Verfallsdatum setzen"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Grupp"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "via e-mail Bescheed ginn"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "erstellen"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "läschen"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "deelen"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email geschéckt"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Warnung"
@@ -517,12 +525,13 @@ msgstr "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv
msgid "You will receive a link to reset your password via Email."
msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Benotzernumm"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Jo, ech wëll mäi Passwuert elo zrécksetzen"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Zeréck setzen"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Bei d'Login-Säit"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Neit Passwuert"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Passwuert zréck setzen"
@@ -684,58 +694,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "En <strong>Admin-Account</strong> uleeën"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passwuert"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Daten-Dossier"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "D'Datebank konfiguréieren"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datebank-Benotzer"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datebank-Passwuert"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datebank Numm"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tabelle-Plaz vun der Datebank"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datebank-Server"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Installatioun ofschléissen"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Schléissen of ..."
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Passwuert vergiess?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "verhalen"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Umellen"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternativ Umeldungen"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index fab35ff0a0268f77cb7c66b58873632cd627f2e3..5d2b1b82f19891edd061eebdef020074dcde57d2 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 3bfb3cdf4ceb122538e1d557713a7f9de8bac2ba..b7bdee50cbaa848d9d8316f9ea1d1237a8bc3d28 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# llaera <llaera@outlook.com>, 2013
+# Laera Loris <llaera@outlook.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Gedeelt vun"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -54,7 +62,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr "Den Passwuert ass incorrect. Probeier ed nach eng keier."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passwuert"
@@ -90,15 +98,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Download"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 40b2c52088952de7f2736166793a285c9438c554..4a754e300d00d2157519a3e23e584876ee22342f 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Michel Weimerskirch <michel@weimerskirch.net>, 2013
+# michel.weimerskirch <michel@weimerskirch.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 10d14bf0be77847567ad4d84c41809c7ff1b5fcb..3626ae3e607277cc1372b35e9f7208bc7f7e7337 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# llaera <llaera@outlook.com>, 2013
+# Laera Loris <llaera@outlook.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Läschen"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ni"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "All"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupp"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standard Quota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Benotzernumm"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index e96e043fa5961c40663079eae9234142009874d9..59a63aa0f2d94a152f73f6c49068a688ce277b7b 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index ad5111b5b9467f72ee1ae46e1e72b2fe4008319e..22ed895d4a094ad07eb58b6d4d478f3b0ef81ccb 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Späicheren"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 6b5e8be8a4833db165284384bb3971503f4eac57..7a1242bed9953ea007cb3fc02675ce478349ce6b 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -5,15 +5,15 @@
# Translators:
# Dr. ROX <to.dr.rox@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
-# mambuta <vspyshkin@gmail.com>, 2013
-# Roman Deniobe <rms200x@gmail.com>, 2013
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# max <vspyshkin@gmail.com>, 2013
+# Roman L. <rms200x@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -152,55 +152,55 @@ msgstr "Nustatymai"
msgid "Saving..."
msgstr "Saugoma..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " prieš %n minutę"
msgstr[1] " prieš %n minučių"
msgstr[2] " prieš %n minučių"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "prieš %n valandą"
msgstr[1] "prieš %n valandų"
msgstr[2] "prieš %n valandų"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "šiandien"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "prieš %n dieną"
msgstr[1] "prieš %n dienas"
msgstr[2] "prieš %n dienų"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "prieš %n mėnesį"
msgstr[1] "prieš %n mėnesius"
msgstr[2] "prieš %n mėnesių"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "prieš metus"
@@ -297,157 +297,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Dalinamasi"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Klaida"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Klaida, kai atšaukiamas dalijimasis"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Klaida, keičiant privilegijas"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Pasidalino su Jumis {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Dalintis su vartotoju arba grupe..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Dalintis nuoroda"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Leisti viešą įkėlimą"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Nusiųsti nuorodą paštu"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Siųsti"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Nustatykite galiojimo laiką"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupė"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "pranešti el. paštu"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "sukurti"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "dalintis"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laiką"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laiką"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Siunčiama..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Laiškas išsiųstas"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Įspėjimas"
@@ -525,12 +533,13 @@ msgstr "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?"
msgid "You will receive a link to reset your password via Email."
msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Prisijungimo vardas"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -538,11 +547,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Taip, aš tikrai noriu atnaujinti slaptažodį"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Atstatyti"
@@ -555,10 +564,11 @@ msgid "To login page"
msgstr "Į prisijungimo puslapį"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Naujas slaptažodis"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Atkurti slaptažodį"
@@ -692,58 +702,59 @@ msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serve
msgid "Create an <strong>admin account</strong>"
msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Slaptažodis"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Duomenų katalogas"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Nustatyti duomenų bazę"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Duomenų bazės vartotojas"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Duomenų bazės slaptažodis"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Duomenų bazės pavadinimas"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Duomenų bazės loginis saugojimas"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Duomenų bazės serveris"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Baigti diegimą"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Baigiama ..."
@@ -785,19 +796,19 @@ msgstr "Autentikacija serveryje nepavyko!"
msgid "Please contact your administrator."
msgstr "Kreipkitės į savo sistemos administratorių."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Pamiršote slaptažodį?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "prisiminti"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Prisijungti"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatyvūs prisijungimai"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 2bde87288d038e50ec7b3bd49f2a3b42ad29484b..620bfbdc96b91266cceba78bcf295adb047afeb6 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -5,13 +5,13 @@
# Translators:
# Dr. ROX <to.dr.rox@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 06bdf86c0763814517d2d257620e78cf91ad36e5..d5c9aabb44e4d0624c87c85dcff5a00dd993a2ff 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -5,13 +5,13 @@
# Translators:
# Dr. ROX <to.dr.rox@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Bendrina {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Dalinasi"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Turinys apsaugotas slaptažodžiu"
@@ -56,7 +64,7 @@ msgstr "Turinys apsaugotas slaptažodžiu"
msgid "The password is wrong. Try again."
msgstr "Netinka slaptažodis: Bandykite dar kartą."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Slaptažodis"
@@ -92,15 +100,31 @@ msgstr "dalinimasis yra išjungtas"
msgid "For more info, please ask the person who sent this link."
msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Tiesioginė nuoroda"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index f9fdbdf8e440efa40d1c4a1ae13eb588be5ddff1..59c3c0ffb86ee1df179ab3eaed94c2fcdcfd7f2c 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# Liudas <liudas@aksioma.lt>, 2013
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -465,3 +465,8 @@ msgstr "Slaptažodis turi būti tinkamas"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index aa4f887552813fbd9f34dcdd0f59c949bf68963e..38296477f61fccbf79dd22773e9e81ddcfad216e 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -4,16 +4,16 @@
#
# Translators:
# Dr. ROX <to.dr.rox@gmail.com>, 2013
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
# Liudas <liudas@aksioma.lt>, 2013
-# fizikiukas <fizikiukas@gmail.com>, 2013
+# Valentinas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -324,7 +324,7 @@ msgstr "Ištrinti"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niekada"
#: js/users/users.js:371
msgid "add group"
@@ -746,7 +746,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Viskas"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -920,7 +920,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupė"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -932,7 +932,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Numatytoji kvota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -952,7 +952,7 @@ msgstr "Prisijungimo vardas"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Limitas"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index cd5e125c5d354b6d8c099e733d6708058fcf33a7..a40d3f69c7946ec4c4fe9fb9f9182aef6310a018 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 36ef72a269cda14af53e1279dcdc7f03150757ac..ee9e23611efad4399f96ba8c1cc1ec240dd4cf1d 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -4,13 +4,13 @@
#
# Translators:
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
-# Min2liz <min2lizz@gmail.com>, 2013
+# Mindaugas <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Išsaugoti"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 4a666f3d97f3b0ceeb324f45e039ab7c7d7b8edd..11f814e461158e9a4ea5e4a4654c53543179a23b 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -148,55 +148,55 @@ msgstr "Iestatījumi"
msgid "Saving..."
msgstr "Saglabā..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Tagad, %n minūtes"
msgstr[1] "Pirms %n minūtes"
msgstr[2] "Pirms %n minūtēm"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Šodien, %n stundas"
msgstr[1] "Pirms %n stundas"
msgstr[2] "Pirms %n stundām"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "šodien"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Šodien, %n dienas"
msgstr[1] "Pirms %n dienas"
msgstr[2] "Pirms %n dienām"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Šomēnes, %n mēneši"
msgstr[1] "Pirms %n mēneša"
msgstr[2] "Pirms %n mēnešiem"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "gājušajā gadā"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -293,157 +293,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Kopīgs"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Kļūda"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Kļūda, daloties"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Kļūda, beidzot dalīties"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Kļūda, mainot atļaujas"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} dalījās ar jums un grupu {group}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} dalījās ar jums"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Aizsargāt ar paroli"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Ļaut publisko augšupielādi."
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Sūtīt saiti personai pa e-pastu"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Sūtīt"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Iestaties termiņa datumu"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupa"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Atkārtota dalīšanās nav atļauta"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Dalījās ar {item} ar {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "izveidot"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "dzēst"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "dalīties"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sūta..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Vēstule nosūtīta"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Brīdinājums"
@@ -521,12 +529,13 @@ msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/liet
msgid "You will receive a link to reset your password via Email."
msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Lietotājvārds"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -534,11 +543,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Jā, Es tiešām vēlos mainīt savu paroli"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -551,10 +560,11 @@ msgid "To login page"
msgstr "Uz ielogošanās lapu"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Jauna parole"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Mainīt paroli"
@@ -688,58 +698,59 @@ msgstr "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"
msgid "Create an <strong>admin account</strong>"
msgstr "Izveidot <strong>administratora kontu</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Parole"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datu mape"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurēt datubāzi"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Datubāzes lietotājs"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Datubāzes parole"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Datubāzes nosaukums"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Datubāzes tabulas telpa"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Datubāzes serveris"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Pabeigt iestatīšanu"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -781,19 +792,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Aizmirsāt paroli?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "atcerēties"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Ierakstīties"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatīvās pieteikšanās"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 02677aedc8c09893caf1efa86e31c059e4c0dd37..3fb082b17f251eddbfeb990f3e3067c0266b7cff 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 27a4822d0360b66831377cc82294263258d56da9..f72424219bead351bd953d3d7e1a6da9ab0576c8 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Dalījās {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Dalījās"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Parole"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Lejupielādēt"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 6b24da4d7070e612055d39f7ead5462ac3cff0e1..e687c411846e11259df1edeeebe0ccc79a3c1d09 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -462,3 +462,8 @@ msgstr "Jānorāda derīga parole"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Šāds lietotājvārds jau tiek izmantots"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 0aad7ec3277819663f388f98fe47bc1c0d4f96b5..195caa13df0456a28eedab6236de68a519cc3f25 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Dzēst"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nekad"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Visi"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupa"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Apjoms pēc noklusējuma"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Lietotājvārds"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Apjoms"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 826752fea82ade29da4309898181217b1f9f793b..76f6d9ea577b169bebd0e2d9ed91d44289487c11 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index 6bb08ea905b540cc075f57efd9fb49d9c35de7fe..541c12ce1ad6123b2eeac5c6d853e32085d2b40e 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Saglabāt"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 17ffa0b71bea97b96279e446fbe4d43a8b02842e..567678b4a267b5542a7cadf0c146c13dec44b433 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miroj <jmiroslav@softhome.net>, 2013
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "Подесувања"
msgid "Saving..."
msgstr "Снимам..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "пред секунди"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "денеска"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "минатиот месец"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "минатата година"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "пред години"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Споделен"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Сподели"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Грешка при споделување"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Грешка при прекин на споделување"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Грешка при промена на привилегии"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Споделено со Вас и групата {group} од {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Споделено со Вас од {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Сподели ја врската"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Заштити со лозинка"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Дозволи јавен аплоуд"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Прати врска по е-пошта на личност"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Прати"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Постави рок на траење"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Не се најдени луѓе"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "група"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Повторно споделување не е дозволено"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} со {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Не споделувај"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "извести преку електронска пошта"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "креирај"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ажурирај"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "избриши"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "сподели"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Заштитено со лозинка"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Грешка при поставување на рок на траење"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Е-порака пратена"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Предупредување"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Корисничко име"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Да, јас сега навистина сакам да ја поништам својата лозинка"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "Кон страницата за најава"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Нова лозинка"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Ресетирај лозинка"
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Направете <strong>администраторска сметка</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Лозинка"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Фолдер со податоци"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Конфигурирај ја базата"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Корисник на база"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Лозинка на база"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Име на база"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Табела во базата на податоци"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Сервер со база"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Заврши го подесувањето"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Завршувам ..."
@@ -776,19 +787,19 @@ msgstr "Автентификацијата на серверската стра
msgid "Please contact your administrator."
msgstr "Ве молиме контактирајте го вашиот администратор."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ја заборавивте лозинката?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "запамти"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Најава"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Алтернативни најавувања"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 8140196bbb8db4b598a158384be5464447c52130..94ff54015098509559da4bd1854c8152a72559f7 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miroj <jmiroslav@softhome.net>, 2013
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 563159672aa54361ccb1ac5ae2f58ca99d58974e..4fecd31e59aa96df7df1435bc9dc41f91005e788 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Споделени од {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Споделено од"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Лозинка"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Преземи"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index b504e56c8ca67cc70f0f481545dcf533c902f7c2..0d37381cc6c5a9a8bec129b7314f64375be61d64 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr "Мора да се обезбеди валидна лозинка"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 419e90dc3ec1c6b95e3002a725ebdb7e24a20206..af44bbf1eb08a5bcde7d6f382c5cc0ba24ce1179 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miroj <jmiroslav@softhome.net>, 2013
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Избриши"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "никогаш"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Сите"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Предефинирана квота"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Корисничко име"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Квота"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 4addbd755b6e24b6279d36abd92444bc0b5fe3c5..9353563c22e2107591f392cfa8cd2c6ae76b556a 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# miroj <jmiroslav@softhome.net>, 2013
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index a7040c0117901677293dac73faa9b451b3f2ccd0..6c4918d1be3760a44b79b2f8496f103448bae927 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -4,13 +4,13 @@
#
# Translators:
# Georgi Stanojevski <glisha@gmail.com>, 2012
-# miroj <jmiroslav@softhome.net>, 2013
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Сними"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index bcec8d63e061cdc339d340968b5ba688bd9a170a..0016a4037b6331075ec1c49b64856003037f0cd9 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po
index 698e2a7b32388b70d2599b03d4f95afb91903131..7a202d54efe9c3ff43cc47e58455d65b88ca04a0 100644
--- a/l10n/ml/files_sharing.po
+++ b/l10n/ml/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
index 520bc128f9439ad6d82165eaff2303008628b2fa..17f6316ba0ae5585b2d377f68c20ccca3df37873 100644
--- a/l10n/ml/lib.po
+++ b/l10n/ml/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 37eb3b602c30f2a858da9e9cf0ce0e80bca5c981..9676311db3d427819a9c964271e99036f4985e8a 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index cd4d6ae314d64261b79a2bc25e1623cdf0e91bd2..0058de717d008925535743b3e391e1255886b76d 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 20e4a4b811ba0f11130cb05211bd85a814930d7a..d172d77d2c1511bf9bec7c86a2ecd21acf09055b 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index 537d85fd0213d93c5e882310ac09767c674e0873..cb0ee4a71e0b074ef340df146025b830a2d054f6 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po
index e0000e0db0a9829c1bc043137e493d45be8686a1..e588f8f270b63123bbd43dc40b9398d319235530 100644
--- a/l10n/mn/files_sharing.po
+++ b/l10n/mn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
index 7a5021e8b7c751efd5dac5d606857ba188ca2c87..cee68d5e4a6b0d32c4a9eeb0b17de72344bbd15d 100644
--- a/l10n/mn/lib.po
+++ b/l10n/mn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index b37ffe8c74f4f5f6bbf27f18a7871bac0d79c9bf..3a0062d4b088d99d542ba19219ec65d8d1e1a28d 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr "Tetapan"
msgid "Saving..."
msgstr "Simpan..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Ralat"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Amaran"
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nama pengguna"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr "Ke halaman log masuk"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Kata laluan baru"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Penetapan semula kata laluan"
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "buat <strong>akaun admin</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Kata laluan"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Fail data"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurasi pangkalan data"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Nama pengguna pangkalan data"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Kata laluan pangkalan data"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nama pangkalan data"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Hos pangkalan data"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Setup selesai"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Hilang kata laluan?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "ingat"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Log masuk"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 2e344d329c9bc7a2b15bc01dd056c16971953dea..8faf4fd5bf4dee800b1fa2e5f1a6b3552810103e 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 28f17948182f646da5965cf322a2dadb17360dd4..54034ac4879fd2d510074871d7e96296bdee7cb9 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Dikongsi dengan"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Kata laluan"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Muat turun"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 05d8a20653badae1da9b341fe4eb8197575a16c1..82e259d833bada85be52be3b064eac2e80e75619 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 8e007571d5eec940955c29c82317d9bbdba0cb62..ca5c7ada1c707466cee747d2d430d7e14bca7122 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Padam"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "jangan"
#: js/users/users.js:371
msgid "add group"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Kuota Lalai"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Nama pengguna"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kuota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 57200af4459907cdf827eba1b15bce755d980f62..4ea25370390cbc6ddbcc95f61058faf84a7efc39 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index a1a951708ccada1087314836ac5e214e3240a76c..be6282472376ed5af0462c2714756d6a62d50273 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Simpan"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 3038869cb3aa4bdc94e32943f5571e93c7a6db85..145e895622e21aaa3fb8f5c412097e17bbfe10f4 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "ဝေမျှမည်"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "သုံးစွဲသူအမည်"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr "ဝင်ရောက်သည့်စာမျက်နှာသို့"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "စကားဝှက်အသစ်"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "စကားဝှက်"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "အချက်အလက်ဖိုလ်ဒါလ်"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Database သုံးစွဲသူ"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Database စကားဝှက်"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Database အမည်"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "မှတ်မိစေသည်"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "ဝင်ရောက်ရန်"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 8c13424f76251d86ae4c97c62cffb5d6e50610ac..784cf6ccbbeb83533c7e36fbfe8f655039b6990c 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 254276402ec0bb64d3a553c32d1555bb79172a5b..af0949780def75ab21c7ce7008d3ab345a42f8c2 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "စကားဝှက်"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ဒေါင်းလုတ်"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 10c7a81006390a20dc43fb52c0d5055766d00ed4..f53d3c714e8fb4114647682b825a4df4057577d6 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 630f4424860a3c06c7529de4bbdd71a5593c3828..989461448ad731ae56a63a9190c51d89f39973ce 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# onionhead <brthomassen@gmail.com>, 2013
-# espenbye <espenbye@me.com>, 2014
+# Bjørn Roger Thomassen <brthomassen@gmail.com>, 2013
+# Espen Bye <espenbye@me.com>, 2014
# vidaren <news@vidartysse.net>, 2014
# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -151,51 +151,51 @@ msgstr "Innstillinger"
msgid "Saving..."
msgstr "Lagrer..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "i dag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dager siden"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dager siden"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "i fjor"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "år siden"
@@ -291,157 +291,165 @@ msgstr "Bra passord"
msgid "Strong password"
msgstr "Sterkt passord"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Delt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Del"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Feil under deling"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Feil ved oppheving av deling"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Feil ved endring av tillatelser"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med deg og gruppen {group} av {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Del med bruker eller gruppe …"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Del lenke"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Den offentlige lenken vil utløpe senest {days} dager etter at den lages"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Som standard vil den offentlige lenken utløpe etter {days} dager"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passordbeskyttet"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Velg et passord for den offentlige lenken"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Tillat Offentlig Opplasting"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Email lenke til person"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Send"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Videredeling er ikke tillatt"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Varsle på email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "opprett"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "oppdater"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "slett"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "del"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Feil ved nullstilling av utløpsdato"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Advarsel"
@@ -519,12 +527,13 @@ msgstr "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var kor
msgid "You will receive a link to reset your password via Email."
msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Brukernavn"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er nullstilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, jeg vil virkelig nullstille passordet mitt nå"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Nullstill"
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "Til innlogginssiden"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nytt passord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Tilbakestill passord"
@@ -686,58 +696,59 @@ msgstr "For informasjon om hvordan du setter opp serveren din riktig, se <a href
msgid "Create an <strong>admin account</strong>"
msgstr "opprett en <strong>administrator-konto</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Lagring og database"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Databasebruker"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Databasepassord"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Databasenavn"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Database tabellområde"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databasevert"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Fullfør oppsetting"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Ferdigstiller ..."
@@ -779,19 +790,19 @@ msgstr "Autentisering feilet på serveren!"
msgid "Please contact your administrator."
msgstr "Vennligst kontakt administratoren din."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Mistet passordet ditt?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "husk"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative innlogginger"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 2136004fbd279d45e9291ff9c8f2d35385ddf147..6a3f3b819aff7de6893a5e3cd9617f131fcf4974 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -5,14 +5,14 @@
# Translators:
# Hans Nesse <>, 2013
# vidaren <news@vidartysse.net>, 2014
-# TheLugal <thelugal@gmail.com>, 2013
+# Sander Danielsen <thelugal@gmail.com>, 2013
# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index bfc8ad9a8afde4fcd1828142b9e07f671d98e25f..0013ce45a030bebb86021df73720013b6c0360db 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 09:51+0000\n"
-"Last-Translator: vidaren <news@vidartysse.net>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Delt med deg"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Delt med andre"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Ingen filer er delt med deg ennå."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Du har ikke delt noen filer ennå."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt av {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Delt av"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "lenke"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Denne delingen er passordbeskyttet"
@@ -55,7 +63,7 @@ msgstr "Denne delingen er passordbeskyttet"
msgid "The password is wrong. Try again."
msgstr "Passordet er feil. Prøv på nytt."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passord"
@@ -91,15 +99,31 @@ msgstr "deling er deaktivert"
msgid "For more info, please ask the person who sent this link."
msgstr "For mer informasjon, spør personen som sendte lenken."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Last ned"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Last ned %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkte lenke"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1b61cf33149decdac84ba0a8eda3e6fa1a5aa6c7..bfc8e3f651964bcf513fb382ee2d4a471575447a 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# espenbye <espenbye@me.com>, 2014
+# Espen Bye <espenbye@me.com>, 2014
# vidaren <news@vidartysse.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Du aksesserer serveren fra et ikke tiltrodd domene."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Oppgi et gyldig passord"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Brukernavnet er allerede i bruk"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index e67a94dc621a9c6d4ad31664b73f48622e7003f6..c032dcd4f9bf33e7b96b15fa1ba868fc53c8f20b 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# espenbye <espenbye@me.com>, 2014
+# Espen Bye <espenbye@me.com>, 2014
# Hans Nesse <>, 2013
# vidaren <news@vidartysse.net>, 2014
# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Slett"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "aldri"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standard Kvote"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Brukernavn"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvote"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 1f324ee1a28bc6339e20cc6ad4dc6d9ce9099014..ed16dd016a2293a9c57be5aa3cc6b32b3bb41856 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 50a6ecd55465ac69550f1cbe863e0c8e071be90b..ee845338f377c817bed584692353fe3636e6e2ff 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# espenbye <espenbye@me.com>, 2013
-# espenbye <espenbye@me.com>, 2012
+# Espen Bye <espenbye@me.com>, 2013
+# Espen Bye <espenbye@me.com>, 2012
# vidaren <news@vidartysse.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Lagre"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index ecb6a381d1efaeead60845b60e37f8c3a3073ad0..7b58fe2dda34f30021bfcf1a834edb79e34fee9f 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po
index 8c1c5ea1f045911ec5271db61174548f3399d8c8..7f34485694739940b2de62e4b3879eeee865e25f 100644
--- a/l10n/nds/files_sharing.po
+++ b/l10n/nds/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index 934b901ba120b71aaf43c39b973b95036c81c22d..b336b29839772a5d4cdf7febe9117d5a7b6b02bd 100644
--- a/l10n/nds/lib.po
+++ b/l10n/nds/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 301954f619c243600d35ad5eea171ccad2b7a411..f5742b51cd57af5fd1f4aec522c077dcf2ff6295 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index fc6db7815dc637ad471af695995313447a0b2dce..42eeb1349df55410e085e447b1bc77e90402acd4 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 09e474157f6ec4db2f297037a5d3ee6b76f2833e..0b64556368500ad1a594a808c1d644f332946363 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index cbaba1b062e272f4b91560bc39d79ede9de74607..bc156ffe21c1d3dab82816e2bda8cc911db2b8f7 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,14 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013-2014
+# Koen Willems <kwillems@zonnet.nl>, 2013-2014
# Jorcee <mail@jordyc.nl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -150,51 +150,51 @@ msgstr "Instellingen"
msgid "Saving..."
msgstr "Opslaan"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "vandaag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "jaar geleden"
@@ -290,157 +290,165 @@ msgstr "Goed wachtwoord"
msgid "Strong password"
msgstr "Sterk wachtwoord"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Gedeeld"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Delen"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fout tijdens het stoppen met delen"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fout tijdens het veranderen van permissies"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeeld met u en de groep {group} door {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Gedeeld met u door {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Delen met gebruiker of groep ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Deel link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Standaard vervalt een openbare link na {days} dagen"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Kies een wachtwoord voor de openbare link"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Sta publieke uploads toe"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "E-mail link naar persoon"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Versturen"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Stel vervaldatum in"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "groep"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "melden per e-mail"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "creëer"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "bijwerken"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "deel"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de vervaldatum"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail verzonden"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Waarschuwing"
@@ -518,12 +526,13 @@ msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord
msgid "You will receive a link to reset your password via Email."
msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -531,11 +540,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ik wil mijn wachtwoord nu echt resetten"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Reset"
@@ -548,10 +557,11 @@ msgid "To login page"
msgstr "Naar de login-pagina"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Reset wachtwoord"
@@ -685,58 +695,59 @@ msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informa
msgid "Create an <strong>admin account</strong>"
msgstr "Maak een <strong>beheerdersaccount</strong> aan"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Wachtwoord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Opslag & database"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Gegevensmap"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configureer de database"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Gebruiker database"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Wachtwoord database"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Naam database"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databaseserver"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Installatie afronden"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Afronden ..."
@@ -778,19 +789,19 @@ msgstr "Authenticatie bij de server mislukte!"
msgid "Please contact your administrator."
msgstr "Neem contact op met uw systeembeheerder."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Wachtwoord vergeten?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "onthoud gegevens"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Meld u aan"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatieve inlogs"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index d9dafabfac8b542be9d3a73e5e12ede51446c63e..7c6c96715404f46b69aef25d67f3a7729e9ceea8 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -4,13 +4,13 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013-2014
+# Koen Willems <kwillems@zonnet.nl>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 6a6940ccb9d726f9f6d15e1bb3eb1a2716e87fe7..eb905fb81da9e9976cfc4701bb40ae97cad19511 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -4,13 +4,13 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# Len <lenny@weijl.org>, 2013
+# Lennart Weijl <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Gedeeld door {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Gedeeld door"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Deze share is met een wachtwoord beveiligd"
@@ -55,7 +63,7 @@ msgstr "Deze share is met een wachtwoord beveiligd"
msgid "The password is wrong. Try again."
msgstr "Wachtwoord ongeldig. Probeer het nogmaals."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Wachtwoord"
@@ -91,15 +99,31 @@ msgstr "delen is uitgeschakeld"
msgid "For more info, please ask the person who sent this link."
msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Downloaden"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Directe link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index eff726815fbb0a658ba10475f31c3c8735dcabac..e5c9b3c27dda89e6f2fb86788c5c748709f0e0b8 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -4,14 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013-2014
-# Len <lenny@weijl.org>, 2013
+# Koen Willems <kwillems@zonnet.nl>, 2013-2014
+# Lennart Weijl <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "U benadert de server vanaf een niet vertrouwd domein."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -460,3 +460,8 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "De gebruikersnaam bestaat al"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 312944a314c4db8d8e6150e3ff85b714f0261c86..f1234e4bf6c0f656e422794967d3caa328fb06f0 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,14 +5,14 @@
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
# helonaut, 2013
-# kwillems <kwillems@zonnet.nl>, 2013-2014
-# Len <lenny@weijl.org>, 2013
+# Koen Willems <kwillems@zonnet.nl>, 2013-2014
+# Lennart Weijl <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Verwijder"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "geen"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Groep"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Standaard limiet"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Gebruikersnaam"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Limieten"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 3519d2722d880b984eb25e13edd8d9c745ce5df7..af1952a01fad31f6fb0f09922b51902c12e313bc 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -4,14 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
-# Len <lenny@weijl.org>, 2013
+# Koen Willems <kwillems@zonnet.nl>, 2013
+# Lennart Weijl <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 67d472b6fd6bbc1ceded208205a4e3d124483de7..c4cd205742ca98b2cd30cd555ddbde3d10b78d6a 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -4,14 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2012-2013
-# Len <lenny@weijl.org>, 2013
+# Lennart Weijl <lenny@weijl.org>, 2013
# Richard Bos <radoeka@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Bewaren"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index a8471658d453ed0344e07a621e79c3fbe9296cdc..8baab7a38b3c6379938b1bcb452c46807b822c71 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
# brekkjen <leif.brekke@oppstryn.no>, 2014
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -151,51 +151,51 @@ msgstr "Innstillingar"
msgid "Saving..."
msgstr "Lagrar …"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt sidan"
msgstr[1] "%n minutt sidan"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time sidan"
msgstr[1] "%n timar sidan"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "i dag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sidan"
msgstr[1] "%n dagar sidan"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "førre månad"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sidan"
msgstr[1] "%n månadar sidan"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "i fjor"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "år sidan"
@@ -291,157 +291,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Delt"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Del"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Feil ved deling"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Feil ved udeling"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Feil ved endring av tillatingar"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med deg og gruppa {group} av {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Passordvern"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Tillat offentleg opplasting"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Send lenkja over e-post"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Send"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "gruppe"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "lag"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "oppdater"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "slett"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "del"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Åtvaring"
@@ -519,12 +527,13 @@ msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/bru
msgid "You will receive a link to reset your password via Email."
msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Brukarnamn"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, eg vil nullstilla passordet mitt no"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "Til innloggingssida"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nytt passord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Nullstill passord"
@@ -686,58 +696,59 @@ msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> f
msgid "Create an <strong>admin account</strong>"
msgstr "Lag ein <strong>admin-konto</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Passord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Set opp databasen"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Databasebrukar"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Databasepassord"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Databasenamn"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tabellnamnrom for database"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databasetenar"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Fullfør oppsettet"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -779,19 +790,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Gløymt passordet?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "hugs"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternative innloggingar"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 7770b316f8415b6ed8bff11a4a19a276ea7070ec..50b1854b47fa5e4ff2ccf1ca9aec65073d5a9dab 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 134c4822d7ad09e111dc904a544df5fcb4db1124..142db1c5c6e2bd3a5491af2864e0a7af36d3845c 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt av {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Delt av"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -54,7 +62,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr "Passordet er gale. Prøv igjen."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Passord"
@@ -90,15 +98,31 @@ msgstr "deling er slått av"
msgid "For more info, please ask the person who sent this link."
msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Last ned"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 1adf00f69ce90b3787a2fb154633f19407362822..f430065111fd2e2c791b8b0f4f2a9673bafdd682 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Du må oppgje eit gyldig passord"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index b61034625ebfd71009ac5093af8f89843ab8d97e..58d24fee03e09f4a15f5e4f89307f3fb09a5d9a9 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:21+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "Slett"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "aldri"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alle"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Gruppe"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -950,7 +950,7 @@ msgstr "Brukarnamn"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvote"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 0fe2a1352a6359d95dff0992b2fbfcd5a7bb59c3..bd7f9c9fe9b2acf05b3d6a0ab29408a63cc8a374 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 5545a7c29d2c45438a4b4a5bfc4a3d6e5e76aeb1..28b7d2d57ea535c79b67461ea3edf2ee2697bf54 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# Kevin Brubeck Unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Lagra"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 34d64e80d5b41e6a1b5b7b6c8aa70b3418aa8c79..a48f0ab795716b26c4a82118324a9094c9e905dd 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index 18d0c2a20347627f75d71c0d800ddc2886a1c003..364370fb2d7dec252e61596f6af5704723b9f0e9 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 3a71bd6c304d376fb47037d99924305d29618c70..774477899faa43151885da70faa4da1df56c4136 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index dab39bd0cad63c1733b0588f99c11e4440691fee..c58dff98992c40135e86089f03d4501afa13da91 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "Configuracion"
msgid "Saving..."
msgstr "Enregistra..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "uèi"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "mes passat"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "an passat"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "ans a"
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Parteja"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Error al partejar"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Error al non partejar"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Error al cambiar permissions"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Parat per senhal"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Met la data d'expiracion"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grop"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "crea"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "met a jorn"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "escafa"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "parteja"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Non d'usancièr"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr "Pagina cap al login"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Senhal novèl"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Senhal tornat botar"
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte admin</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Senhal"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Dorsièr de donadas"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configura la basa de donadas"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usancièr de la basa de donadas"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Senhal de la basa de donadas"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nom de la basa de donadas"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espandi de taula de basa de donadas"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Òste de basa de donadas"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Configuracion acabada"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "L'as perdut lo senhal ?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "bremba-te"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Dintrada"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index b7873391eeccad5dea6b367d3f1d54580c41e940..eaf3db219e4e23f82fc11b1c4a6704c925afe147 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index ddd94931525f9dc59ea3780a8f55a223b4e8275e..deffd5fe2437f680e1f6def550eb2871e8daa8f0 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Senhal"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Avalcarga"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index b4b1bafab001b66fe1da8443c441e9fbd4733506..6ef468c02432ccd128f45dcf10169b6e6903404f 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 191b8e7bcd56946f796dbdd36c643ab5fc42e777..fed672a015599f52a3a0b79efe2b4b287e70a515 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Escafa"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "jamai"
#: js/users/users.js:371
msgid "add group"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota per defaut"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Non d'usancièr"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 9786fb4000d216b9b90216a55f12beab65c0056f..ca88a2e414386027c39f38b59413d0ba8ec74a1f 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 4efdc433c57f4238911fb7456253368599a8c4fb..739804b5da88862a4d4ca8de10588ee771f32b67 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Enregistra"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index 4d7811e043ac07f2b99dd2caa88ec5a2c105b81d..f2c192fe32adb5bc9996f8904cbac5bc4c528a10 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/or_IN/files_sharing.po b/l10n/or_IN/files_sharing.po
index 760e08adf24297206bad234d818a39ad262adeaf..f66de5ef7204c3b74c7fc6905a363af68fd24476 100644
--- a/l10n/or_IN/files_sharing.po
+++ b/l10n/or_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: or_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/or_IN/lib.po b/l10n/or_IN/lib.po
index 179f0affc8d2f934f26aff1c62bb6a2fcf2c79a2..0b94c1f11ad2cf58e6f085e44cfae2ae8ffda45a 100644
--- a/l10n/or_IN/lib.po
+++ b/l10n/or_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: or_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index f188e8eef9a6545cb17fb50c62c66912eaf5626d..f11559f59e895b4ab8604c90e9b066782cffd8c5 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "ਸੈਟਿੰਗ"
msgid "Saving..."
msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "ਅੱਜ"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ਕੱਲ੍ਹ"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ਪਿਛਲੇ ਸਾਲ"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "ਸਾਂਝਾ ਕਰੋ"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "ਗਲ"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "ਭੇਜੋ"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "ਪਾਸਵਰ"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index 30aa6c427d6a5751b012ea32f5a000697723323e..142855066cd5d81cdf900c2dee24d02dec05d2f6 100644
--- a/l10n/pa/files.po
+++ b/l10n/pa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index 3dde06cf4983cc1feb3f958c784cdbe126fce5b9..404d2c89b42bcea29fb71fee94c0eb0e6265febc 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "ਪਾਸਵਰ"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ਡਾਊਨਲੋਡ"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 941af3f56959e588468ae8582161d70a1c1cfe0e..8890459e4c4dc74d63e98bd50780b2c7962f17f4 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index e2a5bcc442885cac9de18035594db0da2f7f4edc..ba192679e2d314d03e4280fb14255358f1e7106b 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -4,15 +4,15 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# maxxx <maxxxrally@gmail.com>, 2014
-# bobie <maciej.przybecki@gmail.com>, 2013-2014
-# adbrand <pkwiecin@adbrand.pl>, 2013
+# Krzysztof Łojowski <maxxxrally@gmail.com>, 2014
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014
+# Piotr Kwiecinski <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -151,55 +151,55 @@ msgstr "Ustawienia"
msgid "Saving..."
msgstr "Zapisywanie..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute temu"
msgstr[1] "%n minut temu"
msgstr[2] "%n minut temu"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n godzine temu"
msgstr[1] "%n godzin temu"
msgstr[2] "%n godzin temu"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "dziś"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dzień temu"
msgstr[1] "%n dni temu"
msgstr[2] "%n dni temu"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n miesiąc temu"
msgstr[1] "%n miesięcy temu"
msgstr[2] "%n miesięcy temu"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "lat temu"
@@ -296,157 +296,165 @@ msgstr "Dobre hasło"
msgid "Strong password"
msgstr "Mocne hasło"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Udostępniono"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Błąd"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Błąd podczas zatrzymywania współdzielenia"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Błąd przy zmianie uprawnień"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Udostępnione tobie i grupie {group} przez {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Udostępnione tobie przez {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Współdziel z użytkownikiem lub grupą ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Udostępnij link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Domyślnie link publiczny wygaśnie po {days} dniach"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Zabezpiecz hasłem"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Wybierz hasło dla linku publicznego"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Pozwól na publiczne wczytywanie"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Wyślij osobie odnośnik poprzez e-mail"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Wyślij"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Ustaw datę wygaśnięcia"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupa"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "powiadom przez emaila"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "utwórz"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "usuń"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "współdziel"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail wysłany"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -524,12 +532,13 @@ msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są p
msgid "You will receive a link to reset your password via Email."
msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nazwa użytkownika"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -537,11 +546,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Tak, naprawdę chcę zresetować hasło teraz"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Resetuj"
@@ -554,10 +563,11 @@ msgid "To login page"
msgstr "Do strony logowania"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nowe hasło"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Zresetuj hasło"
@@ -691,58 +701,59 @@ msgstr "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoz
msgid "Create an <strong>admin account</strong>"
msgstr "Utwórz <strong>konta administratora</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Hasło"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Zasoby dysku & baza danych"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Katalog danych"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Skonfiguruj bazę danych"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Użytkownik bazy danych"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Hasło do bazy danych"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nazwa bazy danych"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Obszar tabel bazy danych"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Komputer bazy danych"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Zakończ konfigurowanie"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Kończę ..."
@@ -784,19 +795,19 @@ msgstr "Uwierzytelnianie po stronie serwera nie powiodło się!"
msgid "Please contact your administrator."
msgstr "Skontaktuj się z administratorem"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Nie pamiętasz hasła?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "pamiętaj"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Zaloguj"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatywne loginy"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index b960003740caa35f23760a7505bdaff0b3d891fa..c601dc06fc672ad9c3a1ef600a5a03faf0e10cbb 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -5,16 +5,16 @@
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
# I Robot, 2013
-# bobie <maciej.przybecki@gmail.com>, 2013-2014
-# Mariusz Fik <fisiu@opensuse.org>, 2013
-# Michal Plichta <mplichta@gmail.com>, 2013
-# adbrand <pkwiecin@adbrand.pl>, 2013
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014
+# Mariusz <fisiu@opensuse.org>, 2013
+# Michał Plichta <mplichta@gmail.com>, 2013
+# Piotr Kwiecinski <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 3ee6dceb9a7adb5b329c6e7fa5fd188ca45fa6c9..44d0e9e89efd843ad21760142127e3a1d69b21d3 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -4,14 +4,14 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# bobie <maciej.przybecki@gmail.com>, 2014
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-02 11:31+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Współdzielony z Tobą"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Współdzielony z innymi"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Nie ma jeszcze żadnych plików współdzielonych z Tobą"
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Nie współdzielisz jeszcze żadnych plików."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Udostępnione przez {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Udostępniane przez"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "link"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Udział ten jest chroniony hasłem"
@@ -55,7 +63,7 @@ msgstr "Udział ten jest chroniony hasłem"
msgid "The password is wrong. Try again."
msgstr "To hasło jest niewłaściwe. Spróbuj ponownie."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Hasło"
@@ -103,3 +111,19 @@ msgstr "Pobierz %s"
#: templates/public.php:54
msgid "Direct link"
msgstr "Bezpośredni link"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 9af478aa78796126c69b17accf02eb7955b376dd..618ebfad57a720c50f250cf01f1632365a7d991e 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -4,14 +4,14 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# hoek <hoek@hoek.pl>, 2014
-# bobie <maciej.przybecki@gmail.com>, 2013-2014
+# Dawid <hoek@hoek.pl>, 2014
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Dostajesz się do serwera z niezaufanej domeny."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -464,3 +464,8 @@ msgstr "Należy podać prawidłowe hasło"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Ta nazwa użytkownika jest już używana"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 8b3a4e8d9ffefc9e7bad013e9ba6a0cad2da2462..929f72ea2c03b98be6c3a2849ba0ae8dcec257cd 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -4,15 +4,15 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
-# hoek <hoek@hoek.pl>, 2014
-# bobie <maciej.przybecki@gmail.com>, 2014
-# adbrand <pkwiecin@adbrand.pl>, 2013
+# Dawid <hoek@hoek.pl>, 2014
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2014
+# Piotr Kwiecinski <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -323,7 +323,7 @@ msgstr "Usuń"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nigdy"
#: js/users/users.js:371
msgid "add group"
@@ -745,7 +745,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Wszystkie"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -919,7 +919,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupa"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -931,7 +931,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Domyślny udział"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,7 +951,7 @@ msgstr "Nazwa użytkownika"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Udział"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 1a323515ef8ed9e5516582821885f1e439ae72b6..de707801fe7acac5f9427006a44d2c6b46940ef1 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -4,16 +4,16 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
-# hoek <hoek@hoek.pl>, 2014
-# orcio6 <orcio6@o2.pl>, 2013
-# maxxx <maxxxrally@gmail.com>, 2014
-# bobie <maciej.przybecki@gmail.com>, 2014
+# Dawid <hoek@hoek.pl>, 2014
+# Jerzy Ruszczak <orcio6@o2.pl>, 2013
+# Krzysztof Łojowski <maxxxrally@gmail.com>, 2014
+# Maciej Przybecki <maciej.przybecki@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index fbdd3d295e3a2292d4dba2fec177d93fcce6b4a5..c3ded3db2334100937b045e47f84493bf7c118e5 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bbartlomiej <bbartlomiej@gmail.com>, 2013
+# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013
# Marcin Małecki <gerber@tkdami.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Zapisz"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 1fe3585546eaab7f848779b27c171b07fe573119..bafeed2a870d3f666c136ebc9869e5997a83539f 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bjamalaro <bjamalaro@yahoo.com.br>, 2013
+# Bruno Jamalaro <bjamalaro@yahoo.com.br>, 2013
# Flávio Veras <flaviove@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Ajustes"
msgid "Saving..."
msgstr "Salvando..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " ha %n minuto"
msgstr[1] "ha %n minutos"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "ha %n hora"
msgstr[1] "ha %n horas"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoje"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "ha %n dia"
msgstr[1] "ha %n dias"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "último mês"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "ha %n mês"
msgstr[1] "ha %n meses"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "último ano"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "anos atrás"
@@ -289,157 +289,165 @@ msgstr "Boa senha"
msgid "Strong password"
msgstr "Senha forte"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Compartilhados"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Erro ao descompartilhar"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartilhado com você e com o grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Compartilhado com você por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Compartilhar com usuário ou grupo ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Compartilher link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "O link público irá expirar não antes de {days} depois de ser criado"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Por padrão o link público irá expirar após {days} dias"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Proteger com senha"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Escolha uma senha para o link público"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir upload público"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar link por e-mail"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Enviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Definir data de expiração"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "notificar por e-mail"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "criar"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "atualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "remover"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "compartilhar"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Aviso"
@@ -517,12 +525,13 @@ msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corre
msgid "You will receive a link to reset your password via Email."
msgstr "Você receberá um link para redefinir sua senha por e-mail."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nome de usuário"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sim, realmente quero criar uma nova senha."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Resetar"
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Para a página de login"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nova senha"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Redefinir senha"
@@ -684,58 +694,59 @@ msgstr "Para obter informações sobre como configurar corretamente o seu servid
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta de administrador</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Senha"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Armazenamento & banco de dados"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurar o banco de dados"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Usuário do banco de dados"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Senha do banco de dados"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nome do banco de dados"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Espaço de tabela do banco de dados"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Host do banco de dados"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Concluir configuração"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Finalizando ..."
@@ -777,19 +788,19 @@ msgstr "Autenticação do servidor falhou!"
msgid "Please contact your administrator."
msgstr "Por favor, contate o administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Esqueceu sua senha?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Fazer login"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Logins alternativos"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index f7b31e456e1ab02ad21989874cdb293da28befc2..4d9eea7ffeb0bc8ad3a73765fa0a02964bff7144 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -4,15 +4,15 @@
#
# Translators:
# André Marcelo Alvarenga <alvarenga@kde.org>, 2014
-# bjamalaro <bjamalaro@yahoo.com.br>, 2013
+# Bruno Jamalaro <bjamalaro@yahoo.com.br>, 2013
# Flávio Veras <flaviove@gmail.com>, 2013-2014
-# tuliouel, 2013
+# Tulio Simoes Martins Padilha, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 5ec9634137a79878b1f5963d05cfc63c1ad983de..dcfc03266086cdcd6ac9e19dc1ed7dc8b7d211fc 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 10:51+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Compartilhado com você"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Compartilhados com outros"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Nenhum arquivo ainda foi compartilhado com você."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Você ainda não compartilhou nenhum arquivo."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartilhado por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Compartilhada por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "link"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este compartilhamento esta protegido por senha"
@@ -54,7 +62,7 @@ msgstr "Este compartilhamento esta protegido por senha"
msgid "The password is wrong. Try again."
msgstr "Senha incorreta. Tente novamente."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Senha"
@@ -90,15 +98,31 @@ msgstr "compartilhamento está desativada"
msgid "For more info, please ask the person who sent this link."
msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este link."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Baixar"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Baixar %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Link direto"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index f0df5c7aa09dc1fe50b42c048e3b99fefab64c1b..010d0463dfdf06ab620f560e05ff0ef95f5ed104 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -4,13 +4,13 @@
#
# Translators:
# Flávio Veras <flaviove@gmail.com>, 2013-2014
-# giovanisp, 2014
+# Giovani Spagnolo, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Você está acessando o servidor a partir de um domínio não confiável."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -459,3 +459,8 @@ msgstr "Forneça uma senha válida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Este nome de usuário já está sendo usado"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 2e9f0c49ff8acfead3f57aae6bddee811aa71e81..9aa556f8ba3aff6b6f3d0c4e25c0cfd5f86802c1 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bjamalaro <bjamalaro@yahoo.com.br>, 2013
+# Bruno Jamalaro <bjamalaro@yahoo.com.br>, 2013
# Flávio Veras <flaviove@gmail.com>, 2013-2014
-# giovanisp, 2014
+# Giovani Spagnolo, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "Excluir"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todos"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota Padrão"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "Nome de Usuário"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Cota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 5b9d6a8ccbb5922699068037841b20bb610530bb..076c4755a554555d725e8dcbeaa2ea9fb8626f87 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -4,13 +4,13 @@
#
# Translators:
# Flávio Veras <flaviove@gmail.com>, 2013-2014
-# tuliouel, 2013
+# Tulio Simoes Martins Padilha, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index 50d9db1652c5998e2fd9aad0a57e3bad1ed4a5e3..b05cc16c7d1f91f9b05c5549e79c64aacaf9e44d 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bjamalaro <bjamalaro@yahoo.com.br>, 2013
+# Bruno Jamalaro <bjamalaro@yahoo.com.br>, 2013
# Rodrigo Tavares <rodrigost23@gmail.com>, 2013
-# thoriumbr <thoriumbr@gmail.com>, 2012
-# tuliouel, 2013
+# Mauro Cesar <thoriumbr@gmail.com>, 2012
+# Tulio Simoes Martins Padilha, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 4e4839aacb86ac465605c49d132709e6349f01bf..c64a3a1957b60eab547a0794de06137d5fa8a683 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -4,11 +4,11 @@
#
# Translators:
# Bruno Martins <inactive+skorzen@transifex.com>, 2013
-# bmgmatias <bmgmatias@gmail.com>, 2013
-# Carlos <crolidge@gmail.com>, 2014
-# Mouxy <daniel@mouxy.net>, 2013
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
-# Gontxi <goncalo.baiao@gmail.com>, 2013
+# Bruno Matias <bmgmatias@gmail.com>, 2013
+# Carlos Moreira <crolidge@gmail.com>, 2014
+# Daniel Pinto <daniel@mouxy.net>, 2013
+# zedascouves <duartegrilo@gmail.com>, 2013
+# Goncalo Baiao <goncalo.baiao@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# Nelson Rosado <nelsontrosado@gmail.com>, 2014
# sccosta <sonia.peres.costa@gmail.com>, 2014
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -156,51 +156,51 @@ msgstr "Configurações"
msgid "Saving..."
msgstr "A guardar..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto atrás"
msgstr[1] "%n minutos atrás"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora atrás"
msgstr[1] "%n horas atrás"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hoje"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dia atrás"
msgstr[1] "%n dias atrás"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ultímo mês"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mês atrás"
msgstr[1] "%n meses atrás"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ano passado"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "anos atrás"
@@ -296,157 +296,165 @@ msgstr "Password Forte"
msgid "Strong password"
msgstr "Password muito forte"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Partilhado"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Erro ao partilhar"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Erro ao deixar de partilhar"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partilhado consigo e com o grupo {group} por {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Partilhado consigo por {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Partilhar com utilizador ou grupo..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Partilhar o link"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "O link público expira, o mais tardar {days} dias após sua criação"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Por defeito, o link publico irá expirar depois de {days} dias"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Defina a palavra-passe para o link público"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permitir Envios Públicos"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Enviar o link por e-mail"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Enviar"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Especificar data de expiração"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupo"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Notificar por email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "criar"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizar"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "apagar"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "partilhar"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Aviso"
@@ -524,12 +532,13 @@ msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username
msgid "You will receive a link to reset your password via Email."
msgstr "Vai receber um endereço para repor a sua password"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nome de utilizador"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -537,11 +546,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Repor"
@@ -554,10 +563,11 @@ msgid "To login page"
msgstr "Para a página de entrada"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nova palavra-chave"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Repor password"
@@ -691,58 +701,59 @@ msgstr "Para obter informações de como configurar correctamente o servidor, ve
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta administrativa</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Password"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Armazenamento e base de dados"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configure a base de dados"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Utilizador da base de dados"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Password da base de dados"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Nome da base de dados"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tablespace da base de dados"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Anfitrião da base de dados"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Acabar instalação"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "A terminar..."
@@ -784,19 +795,19 @@ msgstr "Autenticação do lado do servidor falhou!"
msgid "Please contact your administrator."
msgstr "Por favor contacte o administrador."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Esqueceu-se da sua password?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Contas de acesso alternativas"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 271e097fbde35701b5591bf342ec41cf08e6b068..36c39b0e6ab68a44931de9435d2abd352ead9f67 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bmgmatias <bmgmatias@gmail.com>, 2013
-# Carlos <crolidge@gmail.com>, 2014
-# FernandoMASilva, 2013
+# Bruno Matias <bmgmatias@gmail.com>, 2013
+# Carlos Moreira <crolidge@gmail.com>, 2014
+# Fernando Manuel Anjos Silva, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# Nelson Rosado <nelsontrosado@gmail.com>, 2014
-# Drew Melim <nokostya.translation@gmail.com>, 2014
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
# sccosta <sonia.peres.costa@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 7692a46a0657e38f7c57705a4dadc89b867e8ccd..504bf53f76c29ad4666e8f16ab110336f1617230 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
+# zedascouves <duartegrilo@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
-# moliveira <manuel.oliveira@gmail.com>, 2013
-# Drew Melim <nokostya.translation@gmail.com>, 2014
-# PapiMigas Migas <papimigas@gmail.com>, 2013
+# Manuel Oliveira <manuel.oliveira@gmail.com>, 2013
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
+# PapiMigas <papimigas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-03 05:23+0000\n"
-"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,34 +22,42 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Partilhado consigo "
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Partilhado com outros"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Partilhado por {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Partilhado por"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "ligação"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esta partilha está protegida por palavra-chave"
@@ -58,7 +66,7 @@ msgstr "Esta partilha está protegida por palavra-chave"
msgid "The password is wrong. Try again."
msgstr "Password errada, por favor tente de novo"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Palavra-passe"
@@ -106,3 +114,19 @@ msgstr "Download %s"
#: templates/public.php:54
msgid "Direct link"
msgstr "Link direto"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index c853f6caa5c197600dc7eb89ecc8be6705db2656..1ff6c49078dc1e89fb1fde897dbeb150923d7c82 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -4,15 +4,15 @@
#
# Translators:
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
-# jmruas <jmruas@gmail.com>, 2014
-# Drew Melim <nokostya.translation@gmail.com>, 2014
-# PapiMigas Migas <papimigas@gmail.com>, 2013
+# Jose Manuel Ruas <jmruas@gmail.com>, 2014
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
+# PapiMigas <papimigas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Uma password válida deve ser fornecida"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "O nome de utilizador já está a ser usado"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index c6fa01e3c70810eed54133fad3200f9dcc2805bf..48487e8fb783ac7019333649e50ecb665772d7d3 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# bmgmatias <bmgmatias@gmail.com>, 2013
-# Mouxy <daniel@mouxy.net>, 2013
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
+# Bruno Matias <bmgmatias@gmail.com>, 2013
+# Daniel Pinto <daniel@mouxy.net>, 2013
+# zedascouves <duartegrilo@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
-# jmruas <jmruas@gmail.com>, 2014
+# Jose Manuel Ruas <jmruas@gmail.com>, 2014
# Nelson Rosado <nelsontrosado@gmail.com>, 2013-2014
-# Drew Melim <nokostya.translation@gmail.com>, 2014
-# PapiMigas Migas <papimigas@gmail.com>, 2013
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
+# PapiMigas <papimigas@gmail.com>, 2013
# sccosta <sonia.peres.costa@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -328,7 +328,7 @@ msgstr "Eliminar"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nunca"
#: js/users/users.js:371
msgid "add group"
@@ -750,7 +750,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Todos"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -924,7 +924,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -936,7 +936,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Quota por padrão"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -956,7 +956,7 @@ msgstr "Nome de utilizador"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 15d75ade66b7c5c200b9c240e296be791438614d..46406d749a2a612de0b7b7425658abc1c5b9cdc9 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -4,16 +4,16 @@
#
# Translators:
# Bruno Martins <inactive+skorzen@transifex.com>, 2013
-# Carlos <crolidge@gmail.com>, 2014
-# Mouxy <daniel@mouxy.net>, 2013
+# Carlos Moreira <crolidge@gmail.com>, 2014
+# Daniel Pinto <daniel@mouxy.net>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
-# Drew Melim <nokostya.translation@gmail.com>, 2014
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index 7e10e26d5fa69ea09f2b807ee00061c7d08fd069..6d9edfa5e666df9130cfb1c9dbaafa31b73c367b 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mouxy <daniel@mouxy.net>, 2012-2013
+# Daniel Pinto <daniel@mouxy.net>, 2012-2013
# Helder Meneses <helder.meneses@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 2b909f5c4183a72bf79450971258efd9c44ba744..c864487eec7550639108bbd91fd1f0cf66d30cda 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -4,15 +4,15 @@
#
# Translators:
# corneliu.e <corneliueva@yahoo.com>, 2013
-# dimaursu16 <dima@ceata.org>, 2013
-# ripkid666 <ripkid666@gmail.com>, 2013
-# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
+# Dumitru Ursu <dima@ceata.org>, 2013
+# Popescu Ionut <ripkid666@gmail.com>, 2013
+# Sergiu Sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -151,55 +151,55 @@ msgstr "Setări"
msgid "Saving..."
msgstr "Se salvează..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "acum %n minut"
msgstr[1] "acum %n minute"
msgstr[2] "acum %n minute"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "acum %n oră"
msgstr[1] "acum %n ore"
msgstr[2] "acum %n ore"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "astăzi"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "acum %n zi"
msgstr[1] "acum %n zile"
msgstr[2] "acum %n zile"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "ani în urmă"
@@ -296,157 +296,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Partajat"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Partajează"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Eroare"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Eroare la partajare"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Eroare la anularea partajării"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Eroare la modificarea permisiunilor"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Distribuie cu tine si grupul {group} de {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Distribuie cu tine de {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Permiteţi încărcarea publică."
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Expediază legătura prin poșta electronică"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Expediază"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Specifică data expirării"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grup"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "control acces"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "creare"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "actualizare"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ștergere"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "partajare"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Mesajul a fost expediat"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Atenție"
@@ -524,12 +532,13 @@ msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corec
msgid "You will receive a link to reset your password via Email."
msgstr "Vei primi un mesaj prin care vei putea reseta parola via email."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Nume utilizator"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -537,11 +546,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Da, eu chiar doresc să îmi resetez parola acum"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -554,10 +563,11 @@ msgid "To login page"
msgstr "Spre pagina de autentificare"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Noua parolă"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Resetează parola"
@@ -691,58 +701,59 @@ msgstr "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%
msgid "Create an <strong>admin account</strong>"
msgstr "Crează un <strong>cont de administrator</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Parolă"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Director date"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Configurează baza de date"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Utilizatorul bazei de date"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Parola bazei de date"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Numele bazei de date"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tabela de spațiu a bazei de date"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Bază date"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Finalizează instalarea"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -784,19 +795,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ai uitat parola?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "amintește"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Autentificare"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Conectări alternative"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 07cef1903a1bcbb27348504d9f8137084ec1ce24..5a517c759c925e779cfc9f2b07b64f26b5149508 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mozguletz <__sashok@mail.ru>, 2014
+# Alex <__sashok@mail.ru>, 2014
# andreiacob <andrei.iacob@y7mail.com>, 2014
-# roentgen <arthur.titeica@gmail.com>, 2014
+# Arthur Țițeică <arthur.titeica@gmail.com>, 2014
# corneliu.e <corneliueva@yahoo.com>, 2013
-# dimaursu16 <dima@ceata.org>, 2013
-# inaina <ina.c.ina@gmail.com>, 2013
-# lauraberindei <lauraagavriloae@yahoo.com>, 2014
-# ripkid666 <ripkid666@gmail.com>, 2013
-# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
+# Dumitru Ursu <dima@ceata.org>, 2013
+# ina <ina.c.ina@gmail.com>, 2013
+# laura berindei <lauraagavriloae@yahoo.com>, 2014
+# Popescu Ionut <ripkid666@gmail.com>, 2013
+# Sergiu Sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 1233733c0e3f6024d311bc2a80d5138dfa758a8b..781f7fe682316f1df517e3e8a675a220ad5a446b 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
+# Sergiu Sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "impartite in "
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -54,7 +62,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr "Parola este incorectă. Încercaţi din nou."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Parolă"
@@ -90,15 +98,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Descarcă"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 040fdc4872eaa2efa7927db977c1563b83c0bc1d..85a1765e3f480324705a59e414ba2858d624cae4 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -462,3 +462,8 @@ msgstr "Trebuie să furnizaţi o parolă validă"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index e865a5112e623bcaf811aa4db636e98133bed95d..0938d09801290683b41562b4ba93792c3ad04c3a 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mozguletz <__sashok@mail.ru>, 2014
+# Alex <__sashok@mail.ru>, 2014
# corneliu.e <corneliueva@yahoo.com>, 2013
-# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
+# Sergiu Sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -322,7 +322,7 @@ msgstr "Șterge"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "niciodată"
#: js/users/users.js:371
msgid "add group"
@@ -744,7 +744,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Toate "
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -918,7 +918,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grup"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -930,7 +930,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Cotă implicită"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -950,7 +950,7 @@ msgstr "Nume utilizator"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Cotă"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index c48f5639befc45688ea5d95af38ed93750d62864..f2b72d40b2877726ef382b0a4252eb49336ab4b8 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# lauraberindei <lauraagavriloae@yahoo.com>, 2014
+# laura berindei <lauraagavriloae@yahoo.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index dcf3eb1741267f39634d8eb430ee1b87784e994b..2ad42ba5005ab5fd5a3671a6328b19cf68cda273 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimon Pockemon <>, 2013
-# lauraberindei <lauraagavriloae@yahoo.com>, 2014
-# laurentiucristescu <laur.cristescu@gmail.com>, 2012
+# Dumitru Ursu <>, 2013
+# laura berindei <lauraagavriloae@yahoo.com>, 2014
+# laur cristescu <laur.cristescu@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Salvează"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index f863d0276b5f5714331360c9e76d9df7742293bf..cfa8885f981c7e3e0a992025409a2ed144584069 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,32 +3,32 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Alex <atrigub@gmail.com>, 2013
+# Alexander <atrigub@gmail.com>, 2013
# Alexander Savchenko <a.v.savchenko@mail.ru>, 2014
-# alfsoft <alfsoft@gmail.com>, 2013
-# lord93 <lordakryl@gmail.com>, 2013
-# foool <andrglad@mail.ru>, 2013
-# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Alf <alfsoft@gmail.com>, 2013
+# Andrew Batchmauga <lordakryl@gmail.com>, 2013
+# Andrey Gladilin <andrglad@mail.ru>, 2013
+# Evgenij Spitsyn <evgeniy@spitsyn.net>, 2013
# Gennady <mxiru@mail.ru>, 2014
# jekader <jekader@gmail.com>, 2013
-# Mescalinich <insider.junk@gmail.com>, 2013
-# ppzabortsev <ppz2001@mail.ru>, 2014
-# stushev, 2013
-# eurekafag <rkfg@rkfg.me>, 2013
-# sk.avenger <sk.avenger@adygnet.ru>, 2013
+# Kalinkin Alex <insider.junk@gmail.com>, 2013
+# Pavel P. Zabortsev <ppz2001@mail.ru>, 2014
+# Simon Tushev, 2013
+# Serge Shpikin <rkfg@rkfg.me>, 2013
+# Sk.Avenger <sk.avenger@adygnet.ru>, 2013
# Swab <swab@i.ua>, 2014
# Victor Bravo <>, 2013
-# vsapronov <vladimir.sapronov@gmail.com>, 2013
-# not_your_conscience <hex.void@gmail.com>, 2013
-# Vyacheslav Muranov <s@neola.ru>, 2013
-# Den4md <denstarr@mail.md>, 2013
-# Langaru <langaru@gmail.com>, 2013
+# Vladimir Sapronov <vladimir.sapronov@gmail.com>, 2013
+# Void Ayanami <hex.void@gmail.com>, 2013
+# Вячеслав <s@neola.ru>, 2013
+# Денис <denstarr@mail.md>, 2013
+# Дмитрий <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -167,55 +167,55 @@ msgstr "Конфигурация"
msgid "Saving..."
msgstr "Сохранение..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минуту назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n час назад"
msgstr[1] "%n часа назад"
msgstr[2] "%n часов назад"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "сегодня"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n дня назад"
msgstr[2] "%n дней назад"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "в прошлом месяце"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n месяц назад"
msgstr[1] "%n месяца назад"
msgstr[2] "%n месяцев назад"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "несколько лет назад"
@@ -312,157 +312,165 @@ msgstr "Хороший пароль"
msgid "Strong password"
msgstr "Устойчивый к взлому пароль"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Общие"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Открыть доступ"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Ошибка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Ошибка при открытии доступа"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Ошибка при закрытии доступа"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Ошибка при смене разрешений"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} открыл доступ для Вас и группы {group} "
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} открыл доступ для Вас"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Поделиться с пользователем или группой..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Поделиться ссылкой"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "По умолчанию срок действия публичной ссылки истекает через {days} дней"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Выберите пароль для публичной ссылки"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Разрешить загрузку"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Почтовая ссылка на персону"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Отправить"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Установить срок доступа"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Дата окончания"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Поделится через электронную почту:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ни один человек не найден"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "группа"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Общий доступ не разрешен"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Общий доступ к {item} с {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Закрыть общий доступ"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "уведомить по почте"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "создать"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "обновить"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "удалить"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "открыть доступ"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене срока доступа"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Ошибка при установке срока доступа"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Отправляется ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Письмо отправлено"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Предупреждение"
@@ -540,12 +548,13 @@ msgstr "Запрос не удался. Вы уверены, что email или
msgid "You will receive a link to reset your password via Email."
msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Имя пользователя"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -553,11 +562,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Да, я действительно хочу сбросить свой пароль"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Сброс"
@@ -570,10 +579,11 @@ msgid "To login page"
msgstr "На страницу авторизации"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Новый пароль"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Сбросить пароль"
@@ -707,58 +717,59 @@ msgstr "Для информации, как правильно настроит
msgid "Create an <strong>admin account</strong>"
msgstr "Создать <strong>учётную запись администратора</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Пароль"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Система хранения данных & база данных"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Директория с данными"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Настройка базы данных"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Пользователь базы данных"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Пароль базы данных"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Название базы данных"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Табличое пространство базы данных"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Хост базы данных"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Завершить установку"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Завершаем..."
@@ -800,19 +811,19 @@ msgstr "Неудачная аутентификация с сервером!"
msgid "Please contact your administrator."
msgstr "Пожалуйста, свяжитесь с вашим администратором."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Забыли пароль?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "запомнить"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Войти"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Альтернативные имена пользователя"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index e39d05f0059696e6bc07b81a9c4e2504ac5344c7..fcd9f2317e48a19265b8b96930a1a3b3797204ca 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,27 +3,27 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# lord93 <lordakryl@gmail.com>, 2013
+# Andrew Batchmauga <lordakryl@gmail.com>, 2013
# BuxarNET <buxarnet@gmail.com>, 2014
-# Denis Plastinin <denispal@gmail.com>, 2014
-# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Denis <denispal@gmail.com>, 2014
+# Evgenij Spitsyn <evgeniy@spitsyn.net>, 2013
# Gennady <mxiru@mail.ru>, 2014
# jekader <jekader@gmail.com>, 2013
# mogarych <mogarych@mail.ru>, 2014
-# eurekafag <rkfg@rkfg.me>, 2013
+# Serge Shpikin <rkfg@rkfg.me>, 2013
# Swab <swab@i.ua>, 2014
# Victor Bravo <>, 2013
-# vsapronov <vladimir.sapronov@gmail.com>, 2013
-# not_your_conscience <hex.void@gmail.com>, 2013
-# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
-# hackproof <hackproof.ai@gmail.com>, 2013
-# Friktor <antonshramko@yandex.ru>, 2013
+# Vladimir Sapronov <vladimir.sapronov@gmail.com>, 2013
+# Void Ayanami <hex.void@gmail.com>, 2013
+# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
+# Алексей <hackproof.ai@gmail.com>, 2013
+# Антон <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index bcded84990ff8bf3a9ce0a252739e608a9a37ca0..fad89ac75a2dad85883d7b8e8490e019304b0024 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -5,16 +5,16 @@
# Translators:
# jekader <jekader@gmail.com>, 2014
# mogarych <mogarych@mail.ru>, 2014
-# ppzabortsev <ppz2001@mail.ru>, 2014
+# Pavel P. Zabortsev <ppz2001@mail.ru>, 2014
# Victor Bravo <>, 2013
-# not_your_conscience <hex.void@gmail.com>, 2013
-# Den4md <denstarr@mail.md>, 2013
+# Void Ayanami <hex.void@gmail.com>, 2013
+# Денис <denstarr@mail.md>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -23,34 +23,42 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Доступ открыл {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Опубликовано"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Для доступа к информации необходимо ввести пароль"
@@ -59,7 +67,7 @@ msgstr "Для доступа к информации необходимо вв
msgid "The password is wrong. Try again."
msgstr "Неверный пароль. Попробуйте еще раз."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Пароль"
@@ -95,15 +103,31 @@ msgstr "доступ к информации заблокирован"
msgid "For more info, please ask the person who sent this link."
msgstr "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Скачать"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Скачать %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Прямая ссылка"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 71b365d17a43986d80c91ce8b3bda999f001b564..9e4958a89e689968ebcd579a197be3a6cf3dd83b 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,18 +5,18 @@
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
# jekader <jekader@gmail.com>, 2013
-# tukos, 2014
-# eurekafag <rkfg@rkfg.me>, 2013
-# sk.avenger <sk.avenger@adygnet.ru>, 2013
-# unixoid <victor.ashirov@gmail.com>, 2013
-# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
-# Friktor <antonshramko@yandex.ru>, 2013
+# Kalyuzhniy Aleksey, 2014
+# Serge Shpikin <rkfg@rkfg.me>, 2013
+# Sk.Avenger <sk.avenger@adygnet.ru>, 2013
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013
+# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
+# Антон <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -469,3 +469,8 @@ msgstr "Укажите валидный пароль"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Имя пользователя уже используется"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 764e87501afa8c2692c68a85382cd1b8d054e508..0ad0cc0235f6de625fc3f064c7cd444a94c7a70d 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -5,28 +5,28 @@
# Translators:
# Aleksey Grigoriev <alexvamp@gmail.com>, 2013
# Alexander Shashkevych <alex@stunpix.com>, 2013
-# alfsoft <alfsoft@gmail.com>, 2013
-# lord93 <lordakryl@gmail.com>, 2013
-# Denis Plastinin <denispal@gmail.com>, 2014
-# Denis Plastinin <denispal@gmail.com>, 2014
-# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Alf <alfsoft@gmail.com>, 2013
+# Andrew Batchmauga <lordakryl@gmail.com>, 2013
+# Denis <denispal@gmail.com>, 2014
+# Denis <denispal@gmail.com>, 2014
+# Evgenij Spitsyn <evgeniy@spitsyn.net>, 2013
# jekader <jekader@gmail.com>, 2013
-# eurekafag <rkfg@rkfg.me>, 2013
+# Serge Shpikin <rkfg@rkfg.me>, 2013
# anshibanov <shibanovan@yandex.ru>, 2014
-# stushev, 2014
-# unixoid <victor.ashirov@gmail.com>, 2013
-# vsapronov <vladimir.sapronov@gmail.com>, 2013
-# not_your_conscience <hex.void@gmail.com>, 2013
-# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
-# hackproof <hackproof.ai@gmail.com>, 2013
-# Friktor <antonshramko@yandex.ru>, 2013
-# Иван Тюрин <wen89@inbox.ru>, 2013
+# Simon Tushev, 2014
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013
+# Vladimir Sapronov <vladimir.sapronov@gmail.com>, 2013
+# Void Ayanami <hex.void@gmail.com>, 2013
+# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
+# Алексей <hackproof.ai@gmail.com>, 2013
+# Антон <antonshramko@yandex.ru>, 2013
+# Иван <wen89@inbox.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -337,7 +337,7 @@ msgstr "Удалить"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "никогда"
#: js/users/users.js:371
msgid "add group"
@@ -759,7 +759,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Все"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -933,7 +933,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Группа"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -945,7 +945,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Квота по умолчанию"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -965,7 +965,7 @@ msgstr "Имя пользователя"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Квота"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index ccd9dd82ad120bc665e618b49d7fc477bd5abbd7..d4c4d7976fd36a125f3715337a9d57f06ab344e2 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -4,23 +4,23 @@
#
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
-# Fenuks <fenuksuh@ya.ru>, 2013
-# alfsoft <alfsoft@gmail.com>, 2013
-# Denis Plastinin <denispal@gmail.com>, 2014
+# Alexej Ruseckij <fenuksuh@ya.ru>, 2013
+# Alf <alfsoft@gmail.com>, 2013
+# Denis <denispal@gmail.com>, 2014
# jekader <jekader@gmail.com>, 2013-2014
-# Евгений Белоусов <kvantor12@gmail.com>, 2013
+# Kvantor Lab. <kvantor12@gmail.com>, 2013
# mogarych <mogarych@mail.ru>, 2014
-# ppzabortsev <ppz2001@mail.ru>, 2014
-# unixoid <victor.ashirov@gmail.com>, 2013
-# vsapronov <vladimir.sapronov@gmail.com>, 2013
-# not_your_conscience <hex.void@gmail.com>, 2013
-# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
+# Pavel P. Zabortsev <ppz2001@mail.ru>, 2014
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013
+# Vladimir Sapronov <vladimir.sapronov@gmail.com>, 2013
+# Void Ayanami <hex.void@gmail.com>, 2013
+# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index 73b5571b4c0f587db12f044400232ebfc37b2dcb..8af9d2891cd4ba8a8fcadb48a544909658b1cd02 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -4,17 +4,17 @@
#
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
-# lord93 <lordakryl@gmail.com>, 2013
+# Andrew Batchmauga <lordakryl@gmail.com>, 2013
# Denis <reg.transifex.net@demitel.ru>, 2013
# adol <sharov3@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
+# Сергей Коптев <skoptev@ukr.net>, 2012
# Victor Bravo <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Сохранить"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 711ea5c4ff670d5125e16bfd3eba97e46fd0e408..c46e2dcdc681e7c19e7caf8906c207a0745da6ed 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "සිටුවම්"
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "අද"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "පෙර මාසයේ"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "බෙදා හදා ගන්න"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "දෝෂයක්"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "මුර පදයකින් ආරක්ශාකරන්න"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "කල් ඉකුත් විමේ දිනය"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "විද්යුත් තැපෑල මඟින් බෙදාගන්න: "
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "කණ්ඩායම"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "ප්රවේශ පාලනය"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "සදන්න"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "බෙදාහදාගන්න"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "අවවාදය"
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "පරිශීලක නම"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr "පිවිසුම් පිටුවට"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "නව මුරපදය"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "මුරපදය ප්රත්යාරම්භ කරන්න"
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "මුර පදය"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "දත්ත ෆෝල්ඩරය"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "දත්ත සමුදාය හැඩගැසීම"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "දත්තගබඩා භාවිතාකරු"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "දත්තගබඩාවේ මුරපදය"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "දත්තගබඩාවේ නම"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "දත්තගබඩා සේවාදායකයා"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "මුරපදය අමතකද?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "මතක තබාගන්න"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "ප්රවේශවන්න"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 69206900aea7e8691d6510e3c0736650dba6fece..02a9a340921e6de76bded4c70f24c2b2dcbada4b 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 2dc4b6079e3ea33dbdaa1944ba72a6c479374479..22aa5399d286d2818cf8fb3254346611bd66c96a 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "මුර පදය"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "බාන්න"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 4f9b3a1b345b61fd1477a16e5c47547c05be3527..95c64e570c6575ffdeb4c0e8f07f671e8363a173 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 8ca59052b4d4f0f888ad9142de82d49b5d25ab6f..a7dd418f6e1f5d0d341ab164de5d0ddb2e230c05 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "මකා දමන්න"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "කවදාවත්"
#: js/users/users.js:371
msgid "add group"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "සාමාන්ය සලාකය"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "පරිශීලක නම"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "සලාකය"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index b5307c9f998cc11befb9e69e91d6a6047875e53a..db989a52854cfaec6edc2c6f68c8e99a93430724 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index 9a210583083d14c27bb5290593c4580bb26764ce..5acfab7b4329fbecafc440e93070e06258af9b78 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012
+# anushke787lng <anushke@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "සුරකින්න"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 84dea6b3dde4cd28507e684ce9dea0ca34d8519f..ec6ebbabf8eb8525b3e757bded21c264deacec2d 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -147,55 +147,55 @@ msgstr "Nastavenia"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -292,157 +292,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "skupina"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -520,12 +528,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -533,11 +542,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -550,10 +559,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -687,58 +697,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -780,19 +791,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 828058d196d8584ea222a252c12c166a6e4d3598..d5137a6dadbcec27549139de6afe445eea0a102f 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 91a9be3e9e26511a4840d16a2187fe195f1470ae..81307639eba17a46e4293d85ec56691ca0201da8 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Stiahnuť"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 33d0e4f503e000df38c368b5dd9bdc69b7ba1b0a..da3e5fec13d7f02e84b7f3bfc7522d3696d07455 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 2d722b67da78389cbdc418531505086149d8744f..f0f8f3ad4eb979d58cfba74ec9a3b015cf53ccf3 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Odstrániť"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nikdy"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index de000c9a32bee7c84ba0f4949a60832b5de4d666..9bb6f256358a281c3900947b8adeb04ed0ef90a1 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index d03d90601bd54450a6fd788873ee609df580c29b..4367c001c5a24e93b2384c2ee15fc00ac48845cf 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Uložiť"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 26ebcbfe2904b9d93293223981871fb0778d1e02..895cb726dcca9b84ee4488b2e736e5e9dd70d9b9 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -149,55 +149,55 @@ msgstr "Nastavenia"
msgid "Saving..."
msgstr "Ukladám..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minútou"
msgstr[1] "pred %n minútami"
msgstr[2] "pred %n minútami"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n hodinou"
msgstr[1] "pred %n hodinami"
msgstr[2] "pred %n hodinami"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "dnes"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "včera"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dňom"
msgstr[1] "pred %n dňami"
msgstr[2] "pred %n dňami"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesiacom"
msgstr[1] "pred %n mesiacmi"
msgstr[2] "pred %n mesiacmi"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "pred rokmi"
@@ -294,157 +294,165 @@ msgstr "Dobré heslo"
msgid "Strong password"
msgstr "Silné heslo"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Zdieľané"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Chyba počas ukončenia zdieľania"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Chyba počas zmeny oprávnení"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Zdieľané s vami používateľom {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Zdieľať s používateľom alebo skupinou ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Zdieľať linku"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Povoliť verejné nahrávanie"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Odoslať odkaz emailom"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Odoslať"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Nastaviť dátum expirácie"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Zdieľať cez email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "skupina"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "informovať emailom"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "vymazať"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "zdieľať"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email odoslaný"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Varovanie"
@@ -522,12 +530,13 @@ msgstr "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno
msgid "You will receive a link to reset your password via Email."
msgstr "Odkaz pre obnovenie hesla obdržíte emailom."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Meno používateľa"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -535,11 +544,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Áno, želám si teraz obnoviť svoje heslo"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Resetovať"
@@ -552,10 +561,11 @@ msgid "To login page"
msgstr "Na prihlasovaciu stránku"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nové heslo"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Obnovenie hesla"
@@ -689,58 +699,59 @@ msgstr "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a h
msgid "Create an <strong>admin account</strong>"
msgstr "Vytvoriť <strong>administrátorský účet</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Heslo"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Úložislo & databáza"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Priečinok dát"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Nastaviť databázu"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Používateľ databázy"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Heslo databázy"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Meno databázy"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tabuľkový priestor databázy"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Server databázy"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Dokončiť inštaláciu"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Dokončujem..."
@@ -782,19 +793,19 @@ msgstr "Autentifikácia na serveri zlyhala!"
msgid "Please contact your administrator."
msgstr "Kontaktujte prosím vášho administrátora."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Zabudli ste heslo?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "zapamätať"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Prihlásiť sa"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatívne prihlásenie"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index a2c1b1b5db548c6dff8675e98f49b7961b4c3aea..16a926a1e2717e4d43dc19225e264008a2333f83 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 7957fb37b47ec413d95bbe1664a8fa612bbf7d78..0048b58b96d9c725fc224f7e3e149e330a72e0a7 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Zdieľa {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Zdieľa"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Toto zdieľanie je chránené heslom"
@@ -54,7 +62,7 @@ msgstr "Toto zdieľanie je chránené heslom"
msgid "The password is wrong. Try again."
msgstr "Heslo je chybné. Skúste to znova."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Heslo"
@@ -90,15 +98,31 @@ msgstr "zdieľanie je zakázané"
msgid "For more info, please ask the person who sent this link."
msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Sťahovanie"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Stiahnuť %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Priama linka"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 24b33359cafa5eb3107c790ee64a0d9a6053212a..3b5da2282f7debc9d94376981f59399649d064d3 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -463,3 +463,8 @@ msgstr "Musíte zadať platné heslo"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Meno používateľa je už použité"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 3ea315b579ab70b6f6ae8b6993a6d8d77b3233a9..c298ac3fd8c424e7a4a1f509b87be562bbe48a74 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "Zmazať"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nikdy"
#: js/users/users.js:371
msgid "add group"
@@ -743,7 +743,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Všetky"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -917,7 +917,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Skupina"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -929,7 +929,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Predvolená kvóta"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -949,7 +949,7 @@ msgstr "Používateľské meno"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 96bdd48f7424000ff243748960a8997ad8e1dac2..7b6a9f9e00aba3c1b288359c4d6c4085836fc17e 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013-2014
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013-2014
# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index 89029710c27d5ac23a3e7b462e040c31692ddf88..7f75a2acd55bb4ad1a99a6fb3074dd7eb1f0b96e 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013
# martin, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Uložiť"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 7260b48bacbecb4251951f72fd36649fde1377e7..008fab0fa64e48688ca63b3370e2f90175fab735 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -4,13 +4,13 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -149,11 +149,11 @@ msgstr "Nastavitve"
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minuto"
@@ -161,7 +161,7 @@ msgstr[1] "pred %n minutama"
msgstr[2] "pred %n minutami"
msgstr[3] "pred %n minutami"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n uro"
@@ -169,15 +169,15 @@ msgstr[1] "pred %n urama"
msgstr[2] "pred %n urami"
msgstr[3] "pred %n urami"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "danes"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "včeraj"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dnevom"
@@ -185,11 +185,11 @@ msgstr[1] "pred %n dnevoma"
msgstr[2] "pred %n dnevi"
msgstr[3] "pred %n dnevi"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesecem"
@@ -197,11 +197,11 @@ msgstr[1] "pred %n mesecema"
msgstr[2] "pred %n meseci"
msgstr[3] "pred %n meseci"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "let nazaj"
@@ -299,157 +299,165 @@ msgstr "Dobro geslo"
msgid "Strong password"
msgstr "Odlično geslo"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "V souporabi"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Napaka"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Napaka med souporabo"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Napaka med odstranjevanjem souporabe"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Napaka med spreminjanjem dovoljenj"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "V souporabi z vami. Lastnik je {owner}."
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Souporaba z uporabnikom ali skupino ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Povezava za prejem"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Zaščiti z geslom"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Dovoli javno pošiljanje na strežnik"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Posreduj povezavo po elektronski pošti"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Pošlji"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Nastavi datum preteka"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "skupina"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z uporabnikom {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "obvesti po elektronski pošti"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "ustvari"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "posodobi"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "izbriše"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "določi souporabo"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Zaščiteno z geslom"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Napaka nastavljanja datuma preteka"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Opozorilo"
@@ -527,12 +535,13 @@ msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabnišk
msgid "You will receive a link to reset your password via Email."
msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Uporabniško ime"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -540,11 +549,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Da, potrjujem ponastavitev gesla"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Ponastavi"
@@ -557,10 +566,11 @@ msgid "To login page"
msgstr "Na prijavno stran"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Novo geslo"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Ponastavi geslo"
@@ -694,58 +704,59 @@ msgstr "Za več informacij o pravilnem nastavljanju strežnika, kliknite na pove
msgid "Create an <strong>admin account</strong>"
msgstr "Ustvari <strong>skrbniški račun</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Geslo"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Shramba in podatkovna zbirka"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Podatkovna mapa"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Nastavi podatkovno zbirko"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Uporabnik podatkovne zbirke"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Geslo podatkovne zbirke"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Ime podatkovne zbirke"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Razpredelnica podatkovne zbirke"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Gostitelj podatkovne zbirke"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Končaj nastavitev"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Poteka zaključevanje opravila ..."
@@ -787,19 +798,19 @@ msgstr "Overitev s strežnika je spodletela!"
msgid "Please contact your administrator."
msgstr "Stopite v stik s skrbnikom sistema."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ali ste pozabili geslo?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "zapomni si"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Druge prijavne možnosti"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 35db535cb8275ef54d080ac82bdb5ee25e9a11c2..ec8ff31cf468eb908726828e7eb7efca68a89c6f 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -4,13 +4,13 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 21a004a4c9ae36d9d7c308cc03aea96e2096a215..e328bf1883163f1179c30aaf48aa18326c9aa0ad 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Souporabo omogoča {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "V souporabi z"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "To mesto je zaščiteno z geslom."
@@ -54,7 +62,7 @@ msgstr "To mesto je zaščiteno z geslom."
msgid "The password is wrong. Try again."
msgstr "Geslo je napačno. Poskusite znova."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Geslo"
@@ -90,15 +98,31 @@ msgstr "souporaba je onemogočena."
msgid "For more info, please ask the person who sent this link."
msgstr "Za več podrobnosti stopite v stik s pošiljateljem te povezave."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Prejmi"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Prejmi %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Neposredna povezava"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index cc518044254236eb67cfff6dd0eafd16226bfc97..07a1e79512f5784876d71d374b0693db44a115fd 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -4,13 +4,13 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -467,3 +467,8 @@ msgstr "Navedeno mora biti veljavno geslo"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Vpisano uporabniško ime je že v uporabi"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 6ba219a253f2732a7aaf758d7bf6e3ab4c16ae6c..f6dc61b92d8fddc715e8bd4590bac3625a0bec0a 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -4,13 +4,13 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "Izbriši"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "nikoli"
#: js/users/users.js:371
msgid "add group"
@@ -743,7 +743,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Vsi"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -917,7 +917,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Skupina"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -929,7 +929,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Privzeta količinska omejitev"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -949,7 +949,7 @@ msgstr "Uporabniško ime"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Količinska omejitev"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 198764be77307ef90a3d89198a3a55539d7102bb..c1e4d88feec8a826e50756a828cafc127648b771 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -4,13 +4,13 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013-2014
+# Matej Urbančič <>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 35c35b8cd3ed347c7067f4ff66a03ac99620abea..04ec9dadf69baaf3ab75fb7e277f4fc27bc0682f 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -4,14 +4,14 @@
#
# Translators:
# barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# Matej Urbančič <>, 2013
# Peter Peroša <peter.perosa@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Shrani"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 5605c530a49bb271741a322acb4faa835c141f46..f4ceccebf66f27964a6d4096938eaa977dbd4580 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -149,51 +149,51 @@ msgstr "Parametra"
msgid "Saving..."
msgstr "Duke ruajtur..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut më parë"
msgstr[1] "%n minuta më parë"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n orë më parë"
msgstr[1] "%n orë më parë"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "sot"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "dje"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ditë më parë"
msgstr[1] "%n ditë më parë"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n muaj më parë"
msgstr[1] "%n muaj më parë"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "vite më parë"
@@ -289,157 +289,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Ndarë"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Nda"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Veprim i gabuar gjatë heqjes së ndarjes"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Veprim i gabuar gjatë ndryshimit të lejeve"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Ndarë me ju nga {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Mbro me kod"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Lejo Ngarkimin Publik"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Dërgo email me lidhjen"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Dërgo"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Cakto datën e përfundimit"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grupi"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "krijo"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "azhurno"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "elimino"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "nda"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email-i u dërgua"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -517,12 +525,13 @@ msgstr "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i
msgid "You will receive a link to reset your password via Email."
msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Përdoruesi"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -530,11 +539,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Po, dua ta rivendos kodin tani"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -547,10 +556,11 @@ msgid "To login page"
msgstr "Tek faqja e hyrjes"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Kodi i ri"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Rivendos kodin"
@@ -684,58 +694,59 @@ msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj,
msgid "Create an <strong>admin account</strong>"
msgstr "Krijo një <strong>llogari administruesi</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Kodi"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Emri i dosjes"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfiguro database-in"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Përdoruesi i database-it"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Kodi i database-it"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Emri i database-it"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Tablespace-i i database-it"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Pozicioni (host) i database-it"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Mbaro setup-in"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -777,19 +788,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Ke humbur kodin?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "kujto"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Hyrje"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Hyrje alternative"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 04dd584205a931f2b3680baf91fe5abf780b3d19..8b1a9217b3e7a6993bc868bcf23275c09dbdb98d 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ard1t <ardit.dani@gmail.com>, 2014
+# Ardit Dani <ardit.dani@gmail.com>, 2014
# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index b842e503ae365cd06bfb996f8b7b18a635f036c2..5f75b18b83865334ee2dc72553395380d498ecd1 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ard1t <ardit.dani@gmail.com>, 2014
+# Ardit Dani <ardit.dani@gmail.com>, 2014
# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -19,34 +19,42 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Ndarë nga"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Kjo pjesë është e mbrojtur me fjalëkalim"
@@ -55,7 +63,7 @@ msgstr "Kjo pjesë është e mbrojtur me fjalëkalim"
msgid "The password is wrong. Try again."
msgstr "Kodi është i gabuar. Provojeni përsëri."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Kodi"
@@ -91,15 +99,31 @@ msgstr "ndarja është çaktivizuar"
msgid "For more info, please ask the person who sent this link."
msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Shkarko"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Lidhje direkte"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 6b08941a59ccb6509a38358a87e76c1b401930f3..ea585c1fa9d8748fa02f7e94dd54dc68a7784c9f 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 1cecfda999a7a9d37fce6a01059d6b820bcae6e3..79c80f4fc1004de9ade3ba78bc0dbbfaf6e53560 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Fshi"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "asnjëherë"
#: js/users/users.js:371
msgid "add group"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 25b22979e37626c6d06b5e11f28fdff6c7340e05..a770d800f918f05fde45a7ead0fb75e86f68c914 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 864daaf1430894833248632dd5507d4383b1302e..dc70ac5910863279632cc0a5bc36bbc973e3deb3 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Ruaj"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 6d8f7c889410638b4aa0081c8a974c979e1e6289..b5ef5a1987fcd15ba8d6376fc9f34f65fbcfff0e 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -147,55 +147,55 @@ msgstr "Поставке"
msgid "Saving..."
msgstr "Чување у току..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "данас"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "прошлог месеца"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "прошле године"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "година раније"
@@ -292,157 +292,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Дели"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Грешка у дељењу"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Грешка код искључења дељења"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Грешка код промене дозвола"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Дељено са вама и са групом {group}. Поделио {owner}."
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Поделио са вама {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Заштићено лозинком"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Пошаљи"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Постави датум истека"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Датум истека"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Особе нису пронађене."
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "група"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} са {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "права приступа"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "направи"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ажурирај"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "обриши"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "подели"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума истека"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Грешка код постављања датума истека"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Порука је послата"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Упозорење"
@@ -520,12 +528,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Добићете везу за ресетовање лозинке путем е-поште."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Корисничко име"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -533,11 +542,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -550,10 +559,11 @@ msgid "To login page"
msgstr "На страницу за пријаву"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Нова лозинка"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Ресетуј лозинку"
@@ -687,58 +697,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Направи <strong>административни налог</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Лозинка"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Фацикла података"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Подешавање базе"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Корисник базе"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Лозинка базе"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Име базе"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Радни простор базе података"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Домаћин базе"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Заврши подешавање"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -780,19 +791,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Изгубили сте лозинку?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "упамти"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Пријава"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 12022351844791486f10af2d539d7e731e1691d5..becee87ad9dc0aa56c01dda5dc449d79cc24f77b 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 22a792a173b16703741b17613fe392293e7cb25a..f23ccd26a267975c9d17c348a1a440db6a11e63a 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Делио"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Лозинка"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Преузми"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 5f75d76366bdb3c67da3a816a5c7b22a989b5e48..2efa9420bbdd068eaf14634023a63b0abbb0c8fa 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Морате унети исправну лозинку"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index fc2e540e52a3fd99bf84b81446032fd0d49e083a..9167c0017d19d9c7c49bab97766918c2621dcb0a 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "Обриши"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "никада"
#: js/users/users.js:371
msgid "add group"
@@ -915,7 +915,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Група"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Подразумевано ограничење"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "Корисничко име"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Ограничење"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 8eaa62cc056e415c0e157067e79145975c4c2ff9..3c7847ac84849e73f90dfd9c4f6210f5d1481690 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 740b0e409e788c9aa3a25ee004bf3df18beaf010..bd81198a956c617b00492c563d82b606fa61950c 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Сачувај"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 73cbcbd37da5ff9f04214282a70e6c99b020462e..770f7ac449326ed6a66a811232c14a7cca756647 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# greatbalsa <balsa.l@live.com>, 2014
-# lemi667 <lemi667@gmail.com>, 2013
+# Balša Lazarević <balsa.l@live.com>, 2014
+# Mile Jančić <lemi667@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -149,55 +149,55 @@ msgstr "Podešavanja"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "Pre par sekundi"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "Danas"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "juče"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Prije %n dan."
msgstr[1] "Prije %n dana."
msgstr[2] "Prije %n dana."
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "prošlog meseca"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "prošle godine"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "pre nekoliko godina"
@@ -294,157 +294,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Deljeno"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Podeli"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Greška pri deljenju"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Greška u uklanjanju deljenja"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Greška u promeni dozvola"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} podelio sa Vama i grupom {group} "
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Sa vama podelio {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Zaštita lozinkom"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Pošalji link e-mailom"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Pošalji"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Datum isteka"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Deli putem e-maila"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Nema pronađenih ljudi"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Dalje deljenje nije dozvoljeno"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Deljeno u {item} sa {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Ukljoni deljenje"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "dozvoljene izmene"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "napravi"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "ažuriranje"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "brisanje"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "deljenje"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Zaštćeno lozinkom"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Greška u uklanjanju datuma isteka"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Greška u postavljanju datuma isteka"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Slanje..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email poslat"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -522,12 +530,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Korisničko ime"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -535,11 +544,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -552,10 +561,11 @@ msgid "To login page"
msgstr "Na login stranicu"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nova lozinka"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Resetuj lozinku"
@@ -689,58 +699,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Napravi <strong>administrativni nalog</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Lozinka"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Fascikla podataka"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Podešavanje baze"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Korisnik baze"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Lozinka baze"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Ime baze"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "tablespace baze"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Domaćin baze"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Završi podešavanje"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -782,19 +793,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "upamti"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Prijavi se"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index d8cb851f9905e3e3ed1a562de4774499a28dd853..db0885a9b9f4325b05fac6a576b2aed6b446077b 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index b2c2e71012aa91a1b6d29b6386253473197b09d1..6b2284eda93eab2cd6120217168ad851c0e41f78 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Lozinka"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Preuzmi"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index edda0584b7f628c47b0b2f869bfafaf2e183731f..499b27a1da52ac1a6cde40bd61f322b804effcf5 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 955a699ef6aab69e46bdfac7dcb2e709a54cdf13..3c1fa5a99805bd25a6f8e21b9752d72e4665f35a 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -915,7 +915,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupa"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index e92e12b48e75ca25ffaf26ab87368420e7495874..c34fa45e5b39a2233e9d5bbd523b9f2d654dab74 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index c35b39925cafb99b2e418266e2a7e3c462a94d52..1d81fe348045e51c04965c06d91ecde6b4f5ff8b 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Snimi"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/su/core.po b/l10n/su/core.po
index b05d6311a98737e73e9daf17586ddea1f50f0e1f..5d4b9ca4ea7adf61f77d6ca7cb6019aaae812a0f 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po
index 6311beffd2a45f5fd14415e5db3d4278dafcf6d0..c957fd9fc55c9df74699065532a6b41c1412be10 100644
--- a/l10n/su/files_sharing.po
+++ b/l10n/su/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
index 31c8f652e2d6d570d2a288983cd2137241fedf21..be4dd030a666b47a5cf5bd18d6c53800a72793af 100644
--- a/l10n/su/lib.po
+++ b/l10n/su/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 90011915b2e99b5c1bcd06d2b89e1b4e51ed4744..e301ba2775117fc6e948d552168ebefb2f87b75e 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
# Daniel Sandman <revoltism@gmail.com>, 2013
# enoch85 <enoch85@gmail.com>, 2014
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2013-2014
-# kallemooo <karl.h.thoren@gmail.com>, 2013
+# Juho Ojala, 2013-2014
+# Karl Thorén <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
-# medialabs, 2013
+# Juho Ojala, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -156,51 +156,51 @@ msgstr "Inställningar"
msgid "Saving..."
msgstr "Sparar..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "i dag"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "förra året"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "år sedan"
@@ -296,157 +296,165 @@ msgstr "Bra lösenord"
msgid "Strong password"
msgstr "Starkt lösenord"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Delad"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Dela"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Fel"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Fel vid delning"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Fel när delning skulle avslutas"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Fel vid ändring av rättigheter"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delad med dig och gruppen {group} av {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Delad med dig av {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Dela med användare eller grupp..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Dela länk"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Som standard kommer den publika länken att sluta gälla efter {days} dagar"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Välj ett lösenord för den publika länken"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Tillåt publik uppladdning"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "E-posta länk till person"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Skicka"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Sätt utgångsdatum"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "Grupp"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "informera via e-post"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "skapa"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "uppdatera"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "radera"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "dela"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-post skickat"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Varning"
@@ -524,12 +532,13 @@ msgstr "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/an
msgid "You will receive a link to reset your password via Email."
msgstr "Du får en länk att återställa ditt lösenord via e-post."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Användarnamn"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -537,11 +546,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Ja, jag vill verkligen återställa mitt lösenord nu"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Återställ"
@@ -554,10 +563,11 @@ msgid "To login page"
msgstr "Till logginsidan"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Nytt lösenord"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Återställ lösenordet"
@@ -691,58 +701,59 @@ msgstr "För information hur du korrekt konfigurerar din servern, se ownCloud <a
msgid "Create an <strong>admin account</strong>"
msgstr "Skapa ett <strong>administratörskonto</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Lösenord"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Lagring & databas"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Datamapp"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Konfigurera databasen"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Databasanvändare"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Lösenord till databasen"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Databasnamn"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Databas tabellutrymme"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Databasserver"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Avsluta installation"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Avslutar ..."
@@ -784,19 +795,19 @@ msgstr "Servern misslyckades med autentisering!"
msgid "Please contact your administrator."
msgstr "Kontakta din administratör."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Glömt ditt lösenord?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "kom ihåg"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Logga in"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternativa inloggningar"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 360a015e3583a1a0d4f8ef61b47bc72dd507e37c..4e4ec4ce6d8b0d7cc8cdc318953a73a04bd71424 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
-# DanielMalmgren <daniel@kolefors.se>, 2013
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
+# Daniel Malmgren <daniel@kolefors.se>, 2013
# Daniel Sandman <revoltism@gmail.com>, 2013
# enoch85 <enoch85@gmail.com>, 2014
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# henrikhjelm <mailto@henrikhjelm.se>, 2014
-# medialabs, 2013-2014
-# kallemooo <karl.h.thoren@gmail.com>, 2013
+# henrik hjelm <mailto@henrikhjelm.se>, 2014
+# Juho Ojala, 2013-2014
+# Karl Thorén <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
-# medialabs, 2013
+# Juho Ojala, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 1dec965f64224acfc21af74bb8c731cb7dca0019..cd85bca4838802817942b89030a0e1d6bd999f53 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2014
+# Juho Ojala, 2014
# Magnus Höglund <magnus@linux.com>, 2013
# Stefan Gagner <stefan@mei-ya.se>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 22:41+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,34 +22,42 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Delat med dig"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Delat med andra"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Inga filer har ännu delats med dig."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Du har inte delat några filer ännu."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Delad av {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Delad av"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "länk"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Den här delningen är lösenordsskyddad"
@@ -58,7 +66,7 @@ msgstr "Den här delningen är lösenordsskyddad"
msgid "The password is wrong. Try again."
msgstr "Lösenordet är fel. Försök igen."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Lösenord"
@@ -94,15 +102,31 @@ msgstr "delning är inaktiverat"
msgid "For more info, please ask the person who sent this link."
msgstr "För mer information, kontakta den person som skickade den här länken."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Ladda ner"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "Ladda ner %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Direkt länk"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index a9b41775ac24aedcf4eeb0b3f1cd44ffc4106d1e..726d32fbdf8d21561e50ef09af805ca69bd82fbe 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,20 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
# Daniel Sandman <revoltism@gmail.com>, 2013
# enoch85 <enoch85@gmail.com>, 2014
-# henrikhjelm <mailto@henrikhjelm.se>, 2014
-# medialabs, 2013-2014
-# kallemooo <karl.h.thoren@gmail.com>, 2013
+# henrik hjelm <mailto@henrikhjelm.se>, 2014
+# Juho Ojala, 2013-2014
+# Karl Thorén <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
-# medialabs, 2013
+# Juho Ojala, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Du ansluter till servern från en osäker domän."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -465,3 +465,8 @@ msgstr "Ett giltigt lösenord måste anges"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Användarnamnet används redan"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index d54164873a0e35519015e3344be8286aefdb40c9..65ac82406769690cce9fa176c9746337ed14a6ab 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,25 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
# Daniel Sandman <revoltism@gmail.com>, 2013
# enoch85 <enoch85@gmail.com>, 2014
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# henrikhjelm <mailto@henrikhjelm.se>, 2014
+# henrik hjelm <mailto@henrikhjelm.se>, 2014
# Jan Busk, 2013
# Jan Busk, 2013
-# medialabs, 2013-2014
-# kallemooo <karl.h.thoren@gmail.com>, 2013
+# Juho Ojala, 2013-2014
+# Karl Thorén <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
-# medialabs, 2013
+# Juho Ojala, 2013
# Stefan Gagner <stefan@mei-ya.se>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -332,7 +332,7 @@ msgstr "Radera"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "aldrig"
#: js/users/users.js:371
msgid "add group"
@@ -754,7 +754,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Alla"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grupp"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -940,7 +940,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Förvald datakvot"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -960,7 +960,7 @@ msgstr "Användarnamn"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kvot"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 467bedd392c63873e6a28e28c93086987adf8e95..d8f4e5a9a2b21f80a4c6081db599995f59edbccf 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AsavarTzeth <asavartzeth@gmail.com>, 2014
-# DanielMalmgren <daniel@kolefors.se>, 2013
+# Patrik Nilsson <asavartzeth@gmail.com>, 2014
+# Daniel Malmgren <daniel@kolefors.se>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# henrikhjelm <mailto@henrikhjelm.se>, 2014
+# henrik hjelm <mailto@henrikhjelm.se>, 2014
# Jan Busk, 2013
# Jonas Erlandsson <jonas.erlandsson@gmail.com>, 2013
-# medialabs, 2014
-# kallemooo <karl.h.thoren@gmail.com>, 2013
+# Juho Ojala, 2014
+# Karl Thorén <karl.h.thoren@gmail.com>, 2013
# lagre, 2014
# Magnus Höglund <magnus@linux.com>, 2013
-# medialabs, 2013
+# Juho Ojala, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 2f977462cec3f67a055a1583163a0c7812fc74e1..47e4142ecc4acd0c02ca943d0f537682f29c755d 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# medialabs, 2013
+# Juho Ojala, 2013
# Magnus Höglund <magnus@linux.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Spara"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 527b059caf6025bc72404f36ff6c06d77717fd72..ed16f5bf298a32b0a730d97734c4cd25eae0f7ae 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index b159890de4957566bae9895dd4549e3f57e3b5a4..3e7b4dd7678360bcaef50b38b4a6503dad94026c 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 71d953f6db6f6a930e873cac82792bbb1db4e736..6d207b762d1b5a76724bbab55f4cc3baa4e163ea 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
index 9cf7eeae25e27dcba191e8c194d22178f319964f..d7f9d67063b18f4b805e37e824c3ba6b330a563c 100644
--- a/l10n/ta_IN/core.po
+++ b/l10n/ta_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ta_IN/files_sharing.po b/l10n/ta_IN/files_sharing.po
index 516f00ec2e9e21a029dde69946cef3c978a090fc..d05edf9e30b750f8374ba8c5d6bd129340dc1099 100644
--- a/l10n/ta_IN/files_sharing.po
+++ b/l10n/ta_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ta_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ta_IN/lib.po b/l10n/ta_IN/lib.po
index 595548d72c1d959ccf62e979ceda9967f6a754de..fe50f914b32216450f25d4b7aac4fa7ba089fea2 100644
--- a/l10n/ta_IN/lib.po
+++ b/l10n/ta_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 21614ab917e723f17611ed672e99eaf086639106..ef960267e6212c7936227e2829a0eb51a723bf3d 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr "அமைப்புகள்"
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "இன்று"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "நேற்று"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "கடந்த மாதம்"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "கடந்த வருடம்"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "பகிர்வு"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "வழு"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "பகிரும் போதான வழு"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "பகிராமல் உள்ளப்போதான வழு"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "அனுமதிகள் மாறும்போதான வழு"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "காலாவதி தேதியை குறிப்பிடுக"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "காலவதியாகும் திகதி"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "மின்னஞ்சலினூடான பகிர்வு: "
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "நபர்கள் யாரும் இல்லை"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "குழு"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "பகிரப்படாதது"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "பகிர்தல்"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "எச்சரிக்கை"
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். "
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "பயனாளர் பெயர்"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr "புகுபதிகைக்கான பக்கம்"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "புதிய கடவுச்சொல்"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "மீளமைத்த கடவுச்சொல்"
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "கடவுச்சொல்"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "தரவு கோப்புறை"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "தரவுத்தளத்தை தகவமைக்க"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "தரவுத்தள பயனாளர்"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "தரவுத்தள கடவுச்சொல்"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "தரவுத்தள பெயர்"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "தரவுத்தள அட்டவணை"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "தரவுத்தள ஓம்புனர்"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "அமைப்பை முடிக்க"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "ஞாபகப்படுத்துக"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "புகுபதிகை"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 0cb2f0ec214b71dbaf884e67abf3a1699ec8498c..0f5e40d3ec3f96615b7f6690e21cde4ac6a313a8 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 540f28c40809e6106da3d81ef3897433d7e86aec..aae6ffd2b1c2eb45a7343b36ac400dae0319fce3 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "பகிரப்பட்டது {சொந்தகாரர்}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "கடவுச்சொல்"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "பதிவிறக்குக"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 271da7765ee7cddb81f4f3194bd36cae21aa5a45..5bbafeb3e6269dd9009506be59a42e21a2449889 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index cc10b0a22a70e99be8aab42e7facf87aea03fddf..4decf8a2bb006c59b3690c29726c711408d2ef73 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "நீக்குக"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ஒருபோதும்"
#: js/users/users.js:371
msgid "add group"
@@ -741,7 +741,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "எல்லாம்"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "பொது இருப்பு பங்கு"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "பயனாளர் பெயர்"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "பங்கு"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 8399dbeb50949e02bb359e2f274eebdb7e7ae680..2a642d22466c5f5598c7fe037a68e83fca66fb45 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index fe363f4331a62cb813ce4bb7498a9c6cdadd4c13..ff18a629541b62d857f5dfbc57bcee964ef3d2b1 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# suganthi <suganthi@nic.lk>, 2012
+# Dharmarajah Sri Suganthi <suganthi@nic.lk>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "சேமிக்க "
#: templates/settings.php:6
msgid ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 07649ed8f59c3cb315830d2882023b8682503dd1..2945ccd0461d7b50f07e1256fbb93274827f17cc 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# వీవెన్ వీరపనేని <veeven@gmail.com>, 2014
+# వీవెన్ <veeven@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "అమరికలు"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n నిమిషం క్రితం"
msgstr[1] "%n నిమిషాల క్రితం"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n గంట క్రితం"
msgstr[1] "%n గంటల క్రితం"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "ఈరోజు"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "నిన్న"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n రోజు క్రితం"
msgstr[1] "%n రోజుల క్రితం"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n నెల క్రితం"
msgstr[1] "%n నెలల క్రితం"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "పొరపాటు"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "పంపించు"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "కాలం చెల్లు తేదీ"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "హెచ్చరిక"
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "వాడుకరి పేరు"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "కొత్త సంకేతపదం"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "సంకేతపదం"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "మీ సంకేతపదం పోయిందా?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index a20a28b8d5fa4f608dd9a3674edc8d0e9014f422..761cc8d0b5c52075699ff255d544afa16f9540f7 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index c8d9a648a010af65e86ea3f0aada72b009034a7a..6d8bdaf3e69eaf75db1c9da0315b810d4beffbcf 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "సంకేతపదం"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 5a3381cdfc3ac8959b7619ca39a27c4201b9fda8..f96551cab0a75b22b0d0e54337c925dc9b8db773 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 9bc2f405bc374058472c58ef7a8bef4bdda93a28..82c2979f3d4138b778d2910c30877bd90a698f6a 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index 3c627d7bbe3811aafa9f823c551cd0f78c8c73d2..68b41ec7e706678419d72fe636339ed684052d6a 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "భద్రపరచు"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index dc85e1b450d71595c2371eb7601f7ba6b70e3cc2..9fea3562af6016dfc3da5c2db5e2b10d46277be5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,51 +148,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -288,157 +288,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -516,12 +524,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9be5710bafd7e172893af1430ff2b26e22c1d1d5..fd043da750a9f305c59a82152d00f28dcecdab96 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 2647fceeb8ef0e374914616c10a30f71dd26e1d6..40f2aa06793933dd5997fad0b1e23c405932aed6 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,7 +90,7 @@ msgid ""
"the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:296
+#: hooks/hooks.php:298
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6a5c6134833c6ccf69427f9ea765e26aa71ebb60..4f008733d82b79d4c024f2692274e6ff8204a82e 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index ba05e2235169365f47e732e05a1baaadd013e1b8..f7909427bbef68b8f093816ea467df6c8b2c3626 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,40 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -101,3 +109,19 @@ msgstr ""
#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index b49935af00a313612bfb98cd308fc5a9ade3158a..bb370bfdeab9bbaef64fff85cbd3bc8a88c31c15 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
msgid "Error"
msgstr ""
-#: lib/trashbin.php:861 lib/trashbin.php:863
+#: lib/trashbin.php:862 lib/trashbin.php:864
msgid "restored"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 428bb8b1a2fbb9a028777b799adc08394ac324aa..36943d80f8d8414b8efa586840b9a5b6563806bd 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 54d62e1b3e3c67d67d3c1e50d84875e198112064..4d14e27f131250bd59f6fc091ef63d01b589dfe6 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 63c802333a14ec940bb3ddc48e162e0b8fcfd38b..54d2d9158ad0d81448167d98d83c31091134be1d 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 91d6c916f5f238c457463e79ef12524a0e497ca8..7ecc59627be2d7d51470bbdbc4b4aed3f363affb 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 6ed73fd23a5b69f7279bac84230897f2d7ba90c2..26b0ceb12cdf055034c171b8db2130c78ab18737 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 018b15d6792ab8e8d2be3722d4c9e3fc0448f073..3542e843c3c81de4b03df59ab2264ea925499122 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 799c7b1e5434ec049f0e39d641ad3a656cc63d03..8d874529d155a75bb4dda11fedb38ecdff71c742 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr "ตั้งค่า"
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "วันนี้"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "แชร์แล้ว"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "แชร์"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "ถูกแชร์ให้กับคุณโดย {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "ส่งลิงก์ให้ทางอีเมล"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "ส่ง"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "กำหนดวันที่หมดอายุ"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "วันที่หมดอายุ"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "แชร์ผ่านทางอีเมล"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้องการ"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "กลุ่มผู้ใช้งาน"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "ได้แชร์ {item} ให้กับ {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "สร้าง"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ลบ"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "แชร์"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "กำลังส่ง..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "ส่งอีเมล์แล้ว"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "คำเตือน"
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ชื่อผู้ใช้งาน"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr "ไปที่หน้าเข้าสู่ระบบ"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "รหัสผ่านใหม่"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "เปลี่ยนรหัสผ่าน"
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "รหัสผ่าน"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "โฟลเดอร์เก็บข้อมูล"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "กำหนดค่าฐานข้อมูล"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "รหัสผ่านฐานข้อมูล"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "ชื่อฐานข้อมูล"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "พื้นที่ตารางในฐานข้อมูล"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Database host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "ติดตั้งเรียบร้อยแล้ว"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "ลืมรหัสผ่าน?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "จำรหัสผ่าน"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "เข้าสู่ระบบ"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 43eb54b77672e6ccd74907e132d8078c1d72e6b8..af04b36826519860ea56118577e2ff0084388ce7 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 3da52f0a594ef00d413748aa9b01578084785d43..eb940150939cb041e411bb12cf25f2cad6fc1954 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "ถูกแชร์โดย {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "ถูกแชร์โดย"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "รหัสผ่าน"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index b9645442066e8d7e5d7ec427a8703eee83491d56..e208b6b403ae9f553ff907ca7a502eeb3d1d857f 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 3ed292e3d43adc3045b6767636ebc581cdeed5cd..35070dc945b5d2d1558aeb2fbe1fc0c9889b4b79 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -319,7 +319,7 @@ msgstr "ลบ"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ไม่ต้องเลย"
#: js/users/users.js:371
msgid "add group"
@@ -741,7 +741,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "ทั้งหมด"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -927,7 +927,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "โควต้าที่กำหนดไว้เริ่มต้น"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -947,7 +947,7 @@ msgstr "ชื่อผู้ใช้งาน"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "พื้นที่"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 56977b36b967c530b3b1d375d9a083ee25e12d68..6d3e47421308281576221152ec1ff8788f8b9a84 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 99585fa8fff15e3bedb2ef25652f61b83e13cd64..addc8acec3ec7ecc44aa0eb81b2d5d6be92daaac 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "บันทึก"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index a12ede8ba1be6cedafa1494a0f2dc4eb8a6eeae0..36b2c6239d019a917f9f79fd684cdf2219253c3f 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -4,15 +4,15 @@
#
# Translators:
# Fatih Aşıcı <fatih.asici@gmail.com>, 2013
-# ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# tridinebandim, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013
+# Mustafa Tat, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -151,51 +151,51 @@ msgstr "Ayarlar"
msgid "Saving..."
msgstr "Kaydediliyor..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "saniyeler önce"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n dakika önce"
msgstr[1] "%n dakika önce"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n saat önce"
msgstr[1] "%n saat önce"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "bugün"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "dün"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n gün önce"
msgstr[1] "%n gün önce"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ay önce"
msgstr[1] "%n ay önce"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "yıllar önce"
@@ -291,157 +291,165 @@ msgstr "İyi parola"
msgid "Strong password"
msgstr "Güçlü parola"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Paylaşılan"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Paylaş"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Hata"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Paylaşım iptal edilirken hata"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "İzinleri değiştirirken hata"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} tarafından sizinle ve {group} ile paylaştırılmış"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} tarafından sizinle paylaşıldı"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Kullanıcı veya grup ile paylaş..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Paylaşma bağlantısı"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Parola koruması"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "Herkese açık bağlantı için bir parola seçin"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Herkes Tarafından Gönderime İzin Ver"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Bağlantıyı e-posta ile gönder"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Gönder"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Son kullanma tarihini ayarla"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "E-posta ile paylaş:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "grup"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Tekrar paylaşmaya izin verilmiyor"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "{item} içinde {user} ile paylaşılanlar"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Paylaşmayı Kaldır"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "e-posta ile bildir"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "oluştur"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "güncelle"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "sil"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "paylaş"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Parola korumalı"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Son kullanma tarihi kaldırma hatası"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Son kullanma tarihi ayarlama hatası"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "E-posta gönderildi"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Uyarı"
@@ -519,12 +527,13 @@ msgstr "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru o
msgid "You will receive a link to reset your password via Email."
msgstr "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Kullanıcı Adı"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -532,11 +541,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Sıfırla"
@@ -549,10 +558,11 @@ msgid "To login page"
msgstr "Giriş sayfasına git"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Yeni parola"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Parolayı sıfırla"
@@ -686,58 +696,59 @@ msgstr "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=
msgid "Create an <strong>admin account</strong>"
msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Parola"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "Depolama ve veritabanı"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Veri klasörü"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Veritabanını yapılandır"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Sadece %s kullanılabilir."
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Veritabanı kullanıcı adı"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Veritabanı parolası"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Veritabanı adı"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Veritabanı tablo alanı"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Veritabanı sunucusu"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz."
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Kurulumu tamamla"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Tamamlanıyor ..."
@@ -779,19 +790,19 @@ msgstr "Sunucu taraflı yetkilendirme başarısız!"
msgid "Please contact your administrator."
msgstr "Lütfen sistem yöneticiniz ile iletişime geçin."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Parolanızı mı unuttunuz?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "hatırla"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Giriş yap"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Alternatif Girişler"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 70027866a8f684bcfcfd56c1272e667262538552..5783ed6b0bb755f36e9d5ff1bcd612c67946dc94 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# alicanbatur <alicanbatur@hotmail.com>, 2013
-# Emre Saracoglu <emresaracoglu@live.com>, 2014
-# ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# tridinebandim, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
+# alican batur <alicanbatur@hotmail.com>, 2013
+# Emre Saraçoğlu <emresaracoglu@live.com>, 2014
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013
+# Mustafa Tat, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 2631b23873b84d164d8061369dea359391eb3436..a85a6aeb72953534b55118ebb397c6ff119cd21d 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# volkangezer <volkangezer@gmail.com>, 2013-2014
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-03 14:55+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr "Sizinle paylaşılmış"
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr "Diğerleri ile paylaşılmış"
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr "Henüz sizinle paylaşılan bir dosya yok."
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr "Henüz hiçbir dosya paylaşmadınız."
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} tarafından paylaşılmış"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Paylaşan"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr "bağlantı"
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Bu paylaşım parola korumalı"
@@ -54,7 +62,7 @@ msgstr "Bu paylaşım parola korumalı"
msgid "The password is wrong. Try again."
msgstr "Parola hatalı. Yeniden deneyin."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Parola"
@@ -102,3 +110,19 @@ msgstr "İndir: %s"
#: templates/public.php:54
msgid "Direct link"
msgstr "Doğrudan bağlantı"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 1a89a902d9fe7c408c5a97bc73ed43ae543c9ad0..32e131c20cff91a6f094af223dc7753b7585dbec 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Caner BAŞARAN <basaran.caner@gmail.com>, 2013
-# ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# tridinebandim, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
+# Caner Başaran <basaran.caner@gmail.com>, 2013
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013
+# Mustafa Tat, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz."
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Geçerli bir parola mutlaka sağlanmalı"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Bu kullanıcı adı zaten kullanımda"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index efa85eb6af3739c76bb8d9476fb6423175e6de0b..76e3a78be976dfd6aaa7cf8ac57a011682b908eb 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# DeeJaVu <ddejjavvu@gmail.com>, 2013
-# ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# tridinebandim, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
+# fatih akgun <ddejjavvu@gmail.com>, 2013
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013
+# Mustafa Tat, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 12:11+0000\n"
+"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -287,15 +287,15 @@ msgstr "Şifreleme anahtarlarını geri yükle."
#: js/users/deleteHandler.js:166
msgid "Unable to delete "
-msgstr ""
+msgstr "Silinemeyen: "
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Grup oluşturulurken hata"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Geçerli bir grup adı mutlaka sağlanmalı"
#: js/users/groups.js:205 js/users/users.js:254
msgid "deleted"
@@ -323,7 +323,7 @@ msgstr "Sil"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "asla"
#: js/users/users.js:371
msgid "add group"
@@ -442,14 +442,14 @@ msgstr "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlan
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Veritabanı Başarım Bilgisi"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -741,11 +741,11 @@ msgstr "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\">
#: templates/apps.php:58
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Sadece belirli gruplar için etkinleştir"
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Tümü"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -911,27 +911,27 @@ msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak içi
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Kullanıcı ve Grupları Ara"
#: templates/users/part.grouplist.php:5 templates/users/part.grouplist.php:11
msgid "Add Group"
-msgstr ""
+msgstr "Grup Ekle"
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "Grup"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Herkes"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Yöneticiler"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Varsayılan Kota"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -951,15 +951,15 @@ msgstr "Kullanıcı Adı"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Kota"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Depolama Konumu"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Son Giriş"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index d85e9118e40115cd84d35f4d7dc25feeec333a24..3cade704b7f3303ce91073425f7d164cb5b5f5bd 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 12:01+0000\n"
+"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "Ayarlar korunsun mu?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. Sunucu"
#: js/settings.js:99
msgid "Cannot add server configuration"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index a528472bbf349628b160624cf14e1a796f28db29..06786245949b0b86f17495dbe40bd4c83131a3cb 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# alpere <info@beyboo.de>, 2012
+# Alper <info@beyboo.de>, 2012
# Necdet Yücel <necdetyucel@gmail.com>, 2012
-# atakan96 <tayancatakan@gmail.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013-2014
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# TayançKILIÇLI <tayancatakan@gmail.com>, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
+# Αικατερίνη Χ. Καταπόδη <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 12:11+0000\n"
+"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "WebDAV Kimlik Doğrulaması"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Adres:"
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Kaydet"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index 066eec34d29ce7bc1fd97f541db5e1181e4b9a1d..072a01c7e5f4e306abac71327bf0a3fd7199a2d6 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po
index 4c88071ee15dbc51b7a32abf17c4a6e886223030..52f75aceca63587b44aef1db042d57a6b726d587 100644
--- a/l10n/tzm/files_sharing.po
+++ b/l10n/tzm/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 00af90cabb11d0080d0b075fe0000283e1dc314f..fec3edc263fdaf346909d74900de08aa0b429b4f 100644
--- a/l10n/tzm/lib.po
+++ b/l10n/tzm/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 9ef96de4ae905206cd839196540f43e80e047ee9..57616c2651a3bc1933346686651aa6c1c9740bbe 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr "تەڭشەكلەر"
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "خاتالىق"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "يوللا"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "گۇرۇپپا"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "ئىشلەتكۈچى ئاتى"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "يېڭى ئىم"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "ئىم"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "تەڭشەك تامام"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index db5fa6db82612292ae51ae1de1076d36f2cf7e21..f6debb74b2517aa8b4cda766bafdddd8b031c39e 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index ebf2f525d229a29fcc826ae322a66546327a7ae8..25139de0891b1aad045bf2386982fbb6ddb84aef 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# uqkun <uqkun@outlook.com>, 2013
+# uqkunjan <uqkun@outlook.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "ھەمبەھىرلىگۈچى"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -54,7 +62,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "ئىم"
@@ -90,15 +98,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "چۈشۈر"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 283c0aba3676e52e333b885d554fa51a9b272748..ad48833815be96317c2918ab93e084e44111f39c 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index ea43181ce3ca2c322ef7998a48ce29c9c82ab581..935326a8938dbfc43d64184ef34d7daf01da7dbb 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:21+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "ئۆچۈر"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ھەرگىز"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "ھەممىسى"
#: templates/help.php:13
msgid "Administrator Documentation"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index ee10715260c04512a10735004500b59864083278..c7e3d898eaa1626432795459c95019d38a17e6ec 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index 9269aeab7d1b36c4bbcbb5f8e2952ebe389a8a19..e839fc8eab9c968b574b44a93c1b779c3b051291 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# uqkun <uqkun@outlook.com>, 2013
+# uqkunjan <uqkun@outlook.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "ساقلا"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 36cccaa560a793ab1473e15c95bbf320f17ae9ea..6121c51061d5104e775d6d3d3fd64c4c64d970fb 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# azdk94 <azdk94@gmail.com>, 2014
-# volodya327 <volodya327@gmail.com>, 2013
+# Andri <azdk94@gmail.com>, 2014
+# пан Володимир <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -149,55 +149,55 @@ msgstr "Налаштування"
msgid "Saving..."
msgstr "Зберігаю..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n хвилину тому"
msgstr[1] "%n хвилини тому"
msgstr[2] "%n хвилин тому"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n годину тому"
msgstr[1] "%n години тому"
msgstr[2] "%n годин тому"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "сьогодні"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день тому"
msgstr[1] "%n дні тому"
msgstr[2] "%n днів тому"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n місяць тому"
msgstr[1] "%n місяці тому"
msgstr[2] "%n місяців тому"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "минулого року"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "роки тому"
@@ -294,157 +294,165 @@ msgstr "Добрий пароль"
msgid "Strong password"
msgstr "Надійний пароль"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Опубліковано"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Поділитися"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Помилка"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Помилка під час публікації"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Помилка під час відміни публікації"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Помилка при зміні повноважень"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr " {owner} опублікував для Вас та для групи {group}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} опублікував для Вас"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Поділитися з користувачем або групою ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Опублікувати посилання"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Захистити паролем"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Дозволити Публічне Завантаження"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Ел. пошта належить Пану"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Надіслати"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Встановити термін дії"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "група"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Пере-публікація не дозволяється"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} для {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Закрити доступ"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "повідомити по Email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "створити"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "оновити"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "видалити"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "опублікувати"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Помилка при встановленні терміна дії"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Надсилання..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Ел. пошта надіслана"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Попередження"
@@ -522,12 +530,13 @@ msgstr "Запит завершився невдало !<br>Ви перекон
msgid "You will receive a link to reset your password via Email."
msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Ім'я користувача"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -535,11 +544,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Так, я справді бажаю скинути мій пароль зараз"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Перевстановити"
@@ -552,10 +561,11 @@ msgid "To login page"
msgstr "До сторінки входу"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Новий пароль"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Скинути пароль"
@@ -689,58 +699,59 @@ msgstr "Для отримання інформації, як правильно
msgid "Create an <strong>admin account</strong>"
msgstr "Створити <strong>обліковий запис адміністратора</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Пароль"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Каталог даних"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Налаштування бази даних"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Користувач бази даних"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Пароль для бази даних"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Назва бази даних"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Таблиця бази даних"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Хост бази даних"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Завершити налаштування"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Завершується ..."
@@ -782,19 +793,19 @@ msgstr "Помилка аутентифікації на боці Сервера
msgid "Please contact your administrator."
msgstr "Будь ласка, зверніться до вашого Адміністратора."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Забули пароль?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "запам'ятати"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Вхід"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Альтернативні Логіни"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 0b5bd88c5ab9f6d40082743f4c57eb70a201fb03..50974811a8b464d3a1f8e3f587f261514036f556 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 315d20b9e41d619e9aab26ee18714c63a304f16c..70f82d9f95c5ba289fd253b117be060785337b20 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# volodya327 <volodya327@gmail.com>, 2013
+# пан Володимир <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Опублікував {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Опубліковано"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Цей ресурс обміну захищений паролем"
@@ -54,7 +62,7 @@ msgstr "Цей ресурс обміну захищений паролем"
msgid "The password is wrong. Try again."
msgstr "Невірний пароль. Спробуйте ще раз."
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Пароль"
@@ -90,15 +98,31 @@ msgstr "обмін заборонений"
msgid "For more info, please ask the person who sent this link."
msgstr "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання."
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Завантажити"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "Пряме посилання"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index e53f5c9b691ac13a301cd054d2e87019e47e65f0..293344870da6a69e2b35244b5116cf37db8a9182 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -461,3 +461,8 @@ msgstr "Потрібно задати вірний пароль"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 4a3eb45b0bfab361ac55555ba63303a721f49152..08636cff9805183e5b040cec7c147551067eee59 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Видалити"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "ніколи"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Всі"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Квота за замовчуванням"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Ім'я користувача"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Квота"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index f0a8ef9f8f98dd70dfe43d69f39c77f2dd692f19..42e7f436ac053cbb3bfe8bfea052ba48b5e7f91d 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index cf7356aeb4fcfd5a073726de2aac32e973fbe6c4..a40f7d31144fcf432b72b941308175e6ccc889f8 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# skoptev <skoptev@ukr.net>, 2012
-# volodya327 <volodya327@gmail.com>, 2012
+# Сергей Коптев <skoptev@ukr.net>, 2012
+# пан Володимир <volodya327@gmail.com>, 2012
# zubr139, 2013
-# volodya327 <volodya327@gmail.com>, 2013
+# пан Володимир <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Зберегти"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 5763c8663ee75a6e53de1c8a473fa15858e639f5..333233572d107831923f7202c98f8d48a3921380 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -147,51 +147,51 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -287,157 +287,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -515,12 +523,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -528,11 +537,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -545,10 +554,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -682,58 +692,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -775,19 +786,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po
index 3ac187a15a695f17ed88e2e3990304c426e1c150..f91afb93aced173785c0ea7afca15259c00a5061 100644
--- a/l10n/ur/files_sharing.po
+++ b/l10n/ur/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index 6dc6ce67ad934180d7e74d421e0fda681cb799b7..36c1e5e96aefc108fb386f57aeae4cd68f496af7 100644
--- a/l10n/ur/lib.po
+++ b/l10n/ur/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 50e11231de78c0397e7f7f2754a43ea96dd1dc63..37fe8f9fbfbb8684c827dd60e620ff27e6426ca9 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# leostandards100 <mrshah_300@yahoo.com>, 2014
+# Ahmed Waqar Shah <mrshah_300@yahoo.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -148,51 +148,51 @@ msgstr "ترتیبات"
msgid "Saving..."
msgstr "محفوظ ھو رہا ہے ..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "سیکنڈز پہلے"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n منٹس پہلے"
msgstr[1] "%n منٹس پہلے"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "آج"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "کل"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "پچھلے مہنیے"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "پچھلے سال"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "سالوں پہلے"
@@ -288,157 +288,165 @@ msgstr "اچھا پاسورڈ"
msgid "Strong password"
msgstr "مضبوط پاسورڈ"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "اشتراک شدہ"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "اشتراک"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "خرابی"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "اشتراک کے دوران خرابی "
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "اشترک ختم کرنے کے دوران خرابی"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "اختیارات کو تبدیل کرنے کے دوران خرابی "
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "اشتراک شدہ آپ سے{مالک}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "صارف یا مجموعہ کے ساتھ اشتراک کریں ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "اشتراک لنک"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "ڈیفالٹ میں عوامی لنک ختم ہو جائے گا {دن} دن"
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "محفوظ پاسورڈ"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "عوامی لنک کے لئےپاس ورڈ منتخب کریں"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "پبلک اپ لوڈ کرنے کی اجازت دیں"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "شحص کے لیے ای میل لنک"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "بھجیں"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "تاریخ معیاد سیٹ کریں"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "ای میل کے زریعے ارسال کریں"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "کوئ شخص موجود نہیں "
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "مجموعہ"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "دوبارہ اشتراک کی اجازت نہیں"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "شراکت میں {آئٹم}اور {مستخدم}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "ای میل کے ذریعے مطلع کریں"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "تبدیل کر سکے ھیں"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "خرابی غیر تصحیح تاریخ معیاد"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "خرابی تصحیح تاریخ معیاد"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "ارسال ہو رہا ھے"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "ارسال شدہ ای میل "
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "انتباہ"
@@ -516,12 +524,13 @@ msgstr "گذارش ناکام!<br>کيا پ نے يقينی بنايا کہ آ
msgid "You will receive a link to reset your password via Email."
msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "یوزر نیم"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "ری سیٹ"
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "لاگ ان صفحے کی طرف"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "نیا پاسورڈ"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "ری سیٹ پاسورڈ"
@@ -683,58 +693,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "پاسورڈ"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "ذخیرہ اور ڈیٹا بیس"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "ڈیٹا فولڈر"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "ڈیٹا بیس کونفگر کریں"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "ڈیٹابیس یوزر"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "ڈیٹابیس پاسورڈ"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "ڈیٹابیس کا نام"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "ڈیٹابیس ٹیبل سپیس"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "ڈیٹابیس ہوسٹ"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "سیٹ اپ ختم کریں"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "تکمیل ..."
@@ -776,19 +787,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "یاد رکھیں"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "لاگ ان"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "متبادل لاگ ان "
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 60d91a963bdda47a0710ba0501486bfb2426ee62..e2d797e68fc9cb4da59c80580c1e1ee2b826f698 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index cea9c097ee4d18d476c67b10b323d8a653ef7b37..9bbdb57986a3bb0daddefb18da01bf2f44cc8a92 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr ""
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "سے اشتراک شدہ"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "پاسورڈ"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "ڈاؤن لوڈ،"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index f07a1acdc540fd6aa46fce103d0ee46021eb8c72..12ee138ed9c7a81ce733fc635e9cbe096ba9f4cc 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -457,3 +457,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 9739509d44bf76447726e8fb11950c0d8b20d2dc..40edc1e29ff199ff81eee85ef14860df298cd6e3 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index de6bb8ac11dfc39d42858d4baaa154bae9e824bc..0004998d51c3dd083474dd2fc508223ec62f7352 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "حفظ"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index d6f99fd83cbbdb9fc60a93276bda85ad8c812061..80d280a940362bee5b7d9134d0ec41a665ce431b 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr ""
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr ""
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr ""
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr ""
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr ""
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr ""
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr ""
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr ""
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr ""
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr ""
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr ""
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr ""
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr ""
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr ""
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr ""
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr ""
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr ""
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr ""
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr ""
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr ""
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr ""
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr ""
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr ""
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr ""
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr ""
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr ""
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po
index d2b6f98238cbe4c5bcd35ad52d5a00effeb87682..9091ea54afc208ebb04778dee370d852bffa802b 100644
--- a/l10n/uz/files_sharing.po
+++ b/l10n/uz/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr ""
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr ""
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index b92e649a842437e18190ec611f468d2cc7e6e838..1292c574c8a9b5e6262c24bf8383802fcf6c10fc 100644
--- a/l10n/uz/lib.po
+++ b/l10n/uz/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index f83e120969a8a5db8a6af1c364fb76a996bd109e..73c07c9e6b45419271472a14319aa18c66a5f3b3 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Nguyễn Tài <mattheu.9x@gmail.com>, 2014
-# namphongbody <tunglam062000@gmail.com>, 2014
+# Nguyễn Hữu Tài <mattheu.9x@gmail.com>, 2014
+# Nguyễn Tiến Trình <tunglam062000@gmail.com>, 2014
# Sơn Nguyễn <sonnghit@gmail.com>, 2014
-# xtdv <truong.tx8@gmail.com>, 2013
+# Ta Xuan Truong <truong.tx8@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -151,47 +151,47 @@ msgstr "Cài đặt"
msgid "Saving..."
msgstr "Đang lưu..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "vài giây trước"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n phút trước"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n giờ trước"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "hôm nay"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ngày trước"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n tháng trước"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "năm trước"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "năm trước"
@@ -286,157 +286,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "Được chia sẻ"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "Lỗi"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "Lỗi trong quá trình gỡ chia sẻ"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "Lỗi trong quá trình phân quyền"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "Đã được chia sẽ bởi {owner}"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "Chia sẻ với người dùng hoặc nhóm"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "Chia sẻ liên kết"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "Cho phép công khai tập tin tải lên"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "Liên kết email tới cá nhân"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "Gởi"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "Đặt ngày kết thúc"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "Ngày kết thúc"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "Không tìm thấy người nào"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "nhóm"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "Đã được chia sẽ trong {item} với {user}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "Thông báo qua email"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "tạo"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "cập nhật"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "xóa"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "Lỗi không thiết lập ngày kết thúc"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngày kết thúc"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "Đang gởi ..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email đã được gửi"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "Cảnh báo"
@@ -514,12 +522,13 @@ msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhậ
msgid "You will receive a link to reset your password via Email."
msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Tên đăng nhập"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -527,11 +536,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "Vâng, tôi muốn thiết lập lại mật khẩu ngay."
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "Khởi động lại"
@@ -544,10 +553,11 @@ msgid "To login page"
msgstr "Trang đăng nhập"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "Mật khẩu mới"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "Khôi phục mật khẩu"
@@ -681,58 +691,59 @@ msgstr "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem
msgid "Create an <strong>admin account</strong>"
msgstr "Tạo một <strong>tài khoản quản trị</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "Mật khẩu"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "Thư mục dữ liệu"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "Cấu hình cơ sở dữ liệu"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "Người dùng cơ sở dữ liệu"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "Mật khẩu cơ sở dữ liệu"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "Tên cơ sở dữ liệu"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "Cơ sở dữ liệu tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "Database host"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "Cài đặt hoàn tất"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "Đang hoàn thành ..."
@@ -774,19 +785,19 @@ msgstr "Xác thực phía máy chủ không thành công!"
msgid "Please contact your administrator."
msgstr "Vui lòng liên hệ với quản trị viên."
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "Bạn quên mật khẩu ?"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "ghi nhớ"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "Đăng nhập"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "Đăng nhập khác"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index b1143c228548678540c043dd48336bc01d96b63e..b820cc334b40da2f69a32cfed318337419915172 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Nguyễn Tài <mattheu.9x@gmail.com>, 2014
-# namphongbody <tunglam062000@gmail.com>, 2014
+# Nguyễn Hữu Tài <mattheu.9x@gmail.com>, 2014
+# Nguyễn Tiến Trình <tunglam062000@gmail.com>, 2014
# Sơn Nguyễn <sonnghit@gmail.com>, 2014
-# xtdv <truong.tx8@gmail.com>, 2013
+# Ta Xuan Truong <truong.tx8@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 7f6ec04e13441b74e78c3c8b014695397fdb541d..c03e324904b87154a65afb10646e292e21d776fb 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,34 +17,42 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "Được chia sẽ bởi {owner}"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "Chia sẻ bởi"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "Mật khẩu"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "Tải về"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 85021c1257b220da5fcec93d81fc5391b526295f..4b88a6db62f05fa9086763b1defe8535c45e213e 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index df07446dfbdf9c9443deae2964422b7bc1ceec52..295b6263323b0c163c321052161b0a31aac336b4 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -320,7 +320,7 @@ msgstr "Xóa"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "không thay đổi"
#: js/users/users.js:371
msgid "add group"
@@ -742,7 +742,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "Tất cả"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -916,7 +916,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "N"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -928,7 +928,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "Hạn ngạch mặt định"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -948,7 +948,7 @@ msgstr "Tên đăng nhập"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "Hạn ngạch"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 69121714f462406cb093defbb063902c5ba3349e..f78e567184df58ab894e76d881637bf9ba5e46d0 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 7c7dcb2bec0efd2c55f4daa801780ff36c24420e..8e0b5512fe8ae9b819aaa92b4eea8bc01cf1cc96 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# saosangm <saosangmo@yahoo.com>, 2013
+# sao sang <saosangmo@yahoo.com>, 2013
# Sơn Nguyễn <sonnghit@gmail.com>, 2012,2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "Lưu"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 5e6b9cab9417d9d7e1b24cb5abae2d5cd2bea0dc..928825121dfd8ba6a84c21f425441fbc8beaee69 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -5,16 +5,16 @@
# Translators:
# hanfeng <appweb.cn@gmail.com>, 2013
# jsgang <jsgang9@gmail.com>, 2014
-# smartree <smartree@gmail.com>, 2014
-# Xuetian Weng <wengxt@gmail.com>, 2013-2014
-# min zhang <zm1990s@gmail.com>, 2013
-# min zhang <zm1990s@gmail.com>, 2013
+# Smartree <smartree@gmail.com>, 2014
+# csslayer <wengxt@gmail.com>, 2013-2014
+# zhangmin <zm1990s@gmail.com>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -153,47 +153,47 @@ msgstr "设置"
msgid "Saving..."
msgstr "保存中"
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "今天"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "上月"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "去年"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "年前"
@@ -288,157 +288,165 @@ msgstr "较强的密码"
msgid "Strong password"
msgstr "强密码"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "已共享"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "分享"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "错误"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "共享时出错"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "取消共享时出错"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "修改权限时出错"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} 共享给您及 {group} 组"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} 与您共享"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "分享给其他用户或组 ..."
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "分享链接"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr "这个共享链接将在创建后 {days} 天失效"
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr "默认共享链接失效天数为 {days} "
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "密码保护"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr "为共享链接设置密码"
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "允许公开上传"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "发送链接到个人"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "发送"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "设置过期日期"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "组"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "以邮件通知"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "访问控制"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "创建"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "更新"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "删除"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "共享"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "邮件已发送"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "警告"
@@ -516,12 +524,13 @@ msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
msgid "You will receive a link to reset your password via Email."
msgstr "您将会收到包含可以重置密码链接的邮件。"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "用户名"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "使得，我真的要现在重设密码"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "重置"
@@ -546,10 +555,11 @@ msgid "To login page"
msgstr "到登录页面"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "新密码"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "重置密码"
@@ -683,58 +693,59 @@ msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\"
msgid "Create an <strong>admin account</strong>"
msgstr "创建<strong>管理员账号</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "密码"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr "存储 & 数据库"
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "数据目录"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "配置数据库"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "数据库用户"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "数据库密码"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "数据库名"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "数据库表空间"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "数据库主机"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "安装完成"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "正在结束 ..."
@@ -776,19 +787,19 @@ msgstr "服务端验证失败！"
msgid "Please contact your administrator."
msgstr "请联系你的管理员。"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "忘记密码？"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "记住"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "登录"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "其他登录方式"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index fb90802c84897028604c009368a0783ff58048ac..783f750475027520b75f929c1f336ee460635b76 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,15 +5,15 @@
# Translators:
# Martin Liu <liuzh66@gmail.com>, 2014
# Mengz You <mengz.you@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2014
-# min zhang <zm1990s@gmail.com>, 2013
-# min zhang <zm1990s@gmail.com>, 2013
+# csslayer <wengxt@gmail.com>, 2014
+# zhangmin <zm1990s@gmail.com>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 5435015dca4207c29f7c46bfda4de1942b8802ce..00632fc799a75bec651850449ca014fd30e4511a 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -5,13 +5,13 @@
# Translators:
# Martin Liu <liuzh66@gmail.com>, 2014
# waterone <suiy02@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2014
+# csslayer <wengxt@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,42 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "由{owner}共享"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "共享人"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "这是一个密码保护的共享"
@@ -56,7 +64,7 @@ msgstr "这是一个密码保护的共享"
msgid "The password is wrong. Try again."
msgstr "用户名或密码错误！请重试"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "密码"
@@ -92,15 +100,31 @@ msgstr "共享已禁用"
msgid "For more info, please ask the person who sent this link."
msgstr "欲知详情，请联系发给你链接的人。"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "下载"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr "下载 %s"
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr "直接链接"
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 5b96359f75d5b9f96295499b51ca6b34893552f0..1ea3d86c77ec748c141bc06917d53e83f2cacb12 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -4,16 +4,16 @@
#
# Translators:
# Charlie Mak <makchamhim72@gmail.com>, 2013
-# peishi fang <fangpeishi@gmail.com>, 2014
+# fangpeishi <fangpeishi@gmail.com>, 2014
# Martin Liu <liuzh66@gmail.com>, 2014
-# modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013-2014
+# wang <modokwang@gmail.com>, 2013
+# csslayer <wengxt@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr "您正在访问来自不信任域名的服务器。"
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -458,3 +458,8 @@ msgstr "必须提供合法的密码"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "用户名已被使用"
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 601a401d14d5ee08d36f69e1b66aea9f789523b4..a1ef29dbaf53bb4c6e99730a4a8d8537b52cbe94 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -5,17 +5,17 @@
# Translators:
# Martin Liu <liuzh66@gmail.com>, 2014
# mozillazg <opensource.mozillazg@gmail.com>, 2014
-# m13253 <m13253@hotmail.com>, 2013
+# Star Brilliant <m13253@hotmail.com>, 2013
# waterone <suiy02@gmail.com>, 2013-2014
-# modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013-2014
-# min zhang <zm1990s@gmail.com>, 2013
+# wang <modokwang@gmail.com>, 2013
+# csslayer <wengxt@gmail.com>, 2013-2014
+# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -326,7 +326,7 @@ msgstr "删除"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "从不"
#: js/users/users.js:371
msgid "add group"
@@ -748,7 +748,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "全部"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -922,7 +922,7 @@ msgstr ""
#: templates/users/part.grouplist.php:10
msgid "Group"
-msgstr ""
+msgstr "分组"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
@@ -934,7 +934,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "默认配额"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -954,7 +954,7 @@ msgstr "用户名"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "配额"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 81e88770cce2d04b89eb954ca1355b1e74b79cc5..6245a185d93d1410c4c277c85a908a9728a950ed 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -4,13 +4,13 @@
#
# Translators:
# Martin Liu <liuzh66@gmail.com>, 2014
-# modokwang <modokwang@gmail.com>, 2013
+# wang <modokwang@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index adab2fd027aa16127ae5ddc0f6a3e477ac773a35..c905d42f5d07d6b0905ebcd85210041d5fc59f61 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -6,14 +6,14 @@
# hanfeng <appweb.cn@gmail.com>, 2012
# Dianjin Wang <1132321739qq@gmail.com>, 2012
# marguerite su <i@marguerite.su>, 2013
-# modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# wang <modokwang@gmail.com>, 2013
+# csslayer <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "保存"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 2d86cc463cf67492ee2ada33155260fadad5c6f9..c136d40f2537f796a79df3793b9826a38b204964 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -147,47 +147,47 @@ msgstr "設定"
msgid "Saving..."
msgstr ""
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr ""
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "今日"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "前一月"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr ""
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr ""
@@ -282,157 +282,165 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "已分享"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "分享"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "取消分享時發生錯誤"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "更改權限時發生錯誤"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}與你及群組的分享"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner}與你的分享"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr ""
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "密碼保護"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr ""
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "傳送"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "設定分享期限"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "分享期限"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "找不到"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr ""
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr ""
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr ""
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "新增"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "更新"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "刪除"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "分享"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "密碼保護"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "傳送中"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "郵件已傳"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr ""
@@ -510,12 +518,13 @@ msgstr ""
msgid "You will receive a link to reset your password via Email."
msgstr "你將收到一封電郵"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "用戶名稱"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -523,11 +532,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr ""
@@ -540,10 +549,11 @@ msgid "To login page"
msgstr "前往登入版面"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "新密碼"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "重設密碼"
@@ -677,58 +687,59 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "建立管理員帳戶"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "密碼"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr ""
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "設定資料庫"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "資料庫帳戶"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "資料庫密碼"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "資料庫名稱"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr ""
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr ""
@@ -770,19 +781,19 @@ msgstr ""
msgid "Please contact your administrator."
msgstr ""
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "忘記密碼"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "記住"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "登入"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 4eb1827d941e1a9e5cac1e624f8cf20cbc27451d..0353772a04f7391c98a17167ee6764c637f5f728 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 3325afa23a4b997e5b50e813c20b83506b816311..04c4fdb334a57bcddebc968f932e13882129802d 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,32 +17,40 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
-msgid "Shared by {owner}"
+#: js/settings-admin.js:10
+msgid "Could not load template"
msgstr ""
-#: js/sharedfilelist.js:116
-msgid "Shared by"
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
msgstr ""
-#: js/sharedfilelist.js:220
-msgid "link"
+#: js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:123
+msgid "Shared by"
msgstr ""
#: templates/authenticate.php:4
@@ -53,7 +61,7 @@ msgstr ""
msgid "The password is wrong. Try again."
msgstr ""
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "密碼"
@@ -89,15 +97,31 @@ msgstr ""
msgid "For more info, please ask the person who sent this link."
msgstr ""
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "下載"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index dabea80900b5068a9169e5179cdf343a4fd6ede1..dfcb38d15c5b7eb26abe9c59dbda819c78b9e7ac 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -453,3 +453,8 @@ msgstr ""
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index e6aa5349dcfce4a19ae4d65914334d22a948dd2d..03a33d45b82067662ddb3d5e6efcb8058f4cf6a7 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 3d9e9ecd4c4071d3b34721aae5f3731158c9ba0d..ba23430668f78dfeb4d0265cddf8b234373e8d87 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sy6614 <sy6614@yahoo.com.hk>, 2013
+# Andy Lam <sy6614@yahoo.com.hk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "儲存"
#: templates/settings.php:6
msgid ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 86f2cb9b9e6e28afda60558c1703c4e90027b534..f947575a757e53f7ace308a32574deaf7086795c 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# chenanyeh <chnjsn1221@gmail.com>, 2013
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# Chen-An Yeh <chnjsn1221@gmail.com>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -149,47 +149,47 @@ msgstr "設定"
msgid "Saving..."
msgstr "儲存中..."
-#: js/js.js:1234
+#: js/js.js:1229
msgid "seconds ago"
msgstr "幾秒前"
-#: js/js.js:1235
+#: js/js.js:1230
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: js/js.js:1236
+#: js/js.js:1231
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: js/js.js:1237
+#: js/js.js:1232
msgid "today"
msgstr "今天"
-#: js/js.js:1238
+#: js/js.js:1233
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1239
+#: js/js.js:1234
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:1240
+#: js/js.js:1235
msgid "last month"
msgstr "上個月"
-#: js/js.js:1241
+#: js/js.js:1236
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: js/js.js:1242
+#: js/js.js:1237
msgid "last year"
msgstr "去年"
-#: js/js.js:1243
+#: js/js.js:1238
msgid "years ago"
msgstr "幾年前"
@@ -284,157 +284,165 @@ msgstr "好的密碼"
msgid "Strong password"
msgstr "很強的密碼"
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
msgid "Shared"
msgstr "已分享"
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
msgid "Share"
msgstr "分享"
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:234
+#: js/share.js:285
msgid "Error while unsharing"
msgstr "取消分享時發生錯誤"
-#: js/share.js:241
+#: js/share.js:292
msgid "Error while changing permissions"
msgstr "修改權限時發生錯誤"
-#: js/share.js:251
+#: js/share.js:302
msgid "Shared with you and the group {group} by {owner}"
msgstr "由 {owner} 分享給您和 {group}"
-#: js/share.js:253
+#: js/share.js:304
msgid "Shared with you by {owner}"
msgstr "{owner} 已經和您分享"
-#: js/share.js:277
+#: js/share.js:328
msgid "Share with user or group …"
msgstr "與用戶或群組分享"
-#: js/share.js:283
+#: js/share.js:334
msgid "Share link"
msgstr "分享連結"
-#: js/share.js:289
+#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:291
+#: js/share.js:342
msgid "By default the public link will expire after {days} days"
msgstr ""
-#: js/share.js:296
+#: js/share.js:347
msgid "Password protect"
msgstr "密碼保護"
-#: js/share.js:298
+#: js/share.js:349
msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:304
+#: js/share.js:355
msgid "Allow Public Upload"
msgstr "允許任何人上傳"
-#: js/share.js:308
+#: js/share.js:359
msgid "Email link to person"
msgstr "將連結 email 給別人"
-#: js/share.js:309
+#: js/share.js:360
msgid "Send"
msgstr "寄出"
-#: js/share.js:314
+#: js/share.js:365
msgid "Set expiration date"
msgstr "指定到期日"
-#: js/share.js:315
+#: js/share.js:366
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:352
+#: js/share.js:404
msgid "Share via email:"
msgstr "透過電子郵件分享："
-#: js/share.js:355
+#: js/share.js:407
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
msgid "group"
msgstr "群組"
-#: js/share.js:436
+#: js/share.js:489
msgid "Resharing is not allowed"
msgstr "不允許重新分享"
-#: js/share.js:480
+#: js/share.js:540
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:502
+#: js/share.js:562
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:510
+#: js/share.js:570
msgid "notify by email"
msgstr "以 email 通知"
-#: js/share.js:513
+#: js/share.js:573
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:515
+#: js/share.js:575
msgid "access control"
msgstr "存取控制"
-#: js/share.js:518
+#: js/share.js:578
msgid "create"
msgstr "建立"
-#: js/share.js:521
+#: js/share.js:581
msgid "update"
msgstr "更新"
-#: js/share.js:524
+#: js/share.js:584
msgid "delete"
msgstr "刪除"
-#: js/share.js:527
+#: js/share.js:587
msgid "share"
msgstr "分享"
-#: js/share.js:829
+#: js/share.js:898
msgid "Password protected"
msgstr "受密碼保護"
-#: js/share.js:848
+#: js/share.js:917
msgid "Error unsetting expiration date"
msgstr "取消到期日設定失敗"
-#: js/share.js:869
+#: js/share.js:938
msgid "Error setting expiration date"
msgstr "設定到期日發生錯誤"
-#: js/share.js:898
+#: js/share.js:967
msgid "Sending ..."
msgstr "正在傳送…"
-#: js/share.js:909
+#: js/share.js:978
msgid "Email sent"
msgstr "Email 已寄出"
-#: js/share.js:933
+#: js/share.js:1002
msgid "Warning"
msgstr "警告"
@@ -512,12 +520,13 @@ msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名
msgid "You will receive a link to reset your password via Email."
msgstr "重設密碼的連結將會寄到您的電子郵件信箱。"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "使用者名稱"
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -525,11 +534,11 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
msgid "Yes, I really want to reset my password now"
msgstr "對，我現在想要重設我的密碼。"
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
msgid "Reset"
msgstr "重設"
@@ -542,10 +551,11 @@ msgid "To login page"
msgstr "至登入頁面"
#: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "新密碼"
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
msgid "Reset password"
msgstr "重設密碼"
@@ -679,58 +689,59 @@ msgstr "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如
msgid "Create an <strong>admin account</strong>"
msgstr "建立一個<strong>管理者帳號</strong>"
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
msgid "Password"
msgstr "密碼"
-#: templates/installation.php:70
+#: templates/installation.php:72
msgid "Storage & database"
msgstr ""
-#: templates/installation.php:77
+#: templates/installation.php:79
msgid "Data folder"
msgstr "資料儲存位置"
-#: templates/installation.php:90
+#: templates/installation.php:92
msgid "Configure the database"
msgstr "設定資料庫"
-#: templates/installation.php:94
+#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
msgstr "資料庫使用者"
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
msgid "Database password"
msgstr "資料庫密碼"
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
msgid "Database name"
msgstr "資料庫名稱"
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
msgid "Database tablespace"
msgstr "資料庫 tablespace"
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
msgid "Database host"
msgstr "資料庫主機"
-#: templates/installation.php:150
+#: templates/installation.php:157
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
msgstr ""
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finish setup"
msgstr "完成設定"
-#: templates/installation.php:152
+#: templates/installation.php:159
msgid "Finishing …"
msgstr "即將完成…"
@@ -772,19 +783,19 @@ msgstr "伺服器端認證失敗！"
msgid "Please contact your administrator."
msgstr "請聯絡系統管理員。"
-#: templates/login.php:48
+#: templates/login.php:50
msgid "Lost your password?"
msgstr "忘記密碼？"
-#: templates/login.php:53
+#: templates/login.php:55
msgid "remember"
msgstr "記住"
-#: templates/login.php:57
+#: templates/login.php:59
msgid "Log in"
msgstr "登入"
-#: templates/login.php:63
+#: templates/login.php:65
msgid "Alternative Logins"
msgstr "其他登入方法"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 5c4aeb30a11047f84d17436bc031a3f13cb8ec1b..cabb8ccd1a020bee94ee9244b006329e17cab902 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sy6614 <sy6614@yahoo.com.hk>, 2013
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# Andy Lam <sy6614@yahoo.com.hk>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 7ff3f0538ef3c97d23936474247556757f77e128..d76e79e7827e4adb036bb8b286c61e522c91cc5d 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-01 01:54-0400\n"
-"PO-Revision-Date: 2014-05-31 06:12+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -18,34 +18,42 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: appinfo/app.php:32 js/app.js:32
+#: appinfo/app.php:35 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:41 js/app.js:51
+#: appinfo/app.php:44 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: js/app.js:33
+#: js/app.js:35
msgid "No files have been shared with you yet."
msgstr ""
-#: js/app.js:52
+#: js/app.js:54
msgid "You haven't shared any files yet."
msgstr ""
-#: js/share.js:47 js/share.js:55
+#: js/settings-admin.js:10
+msgid "Could not load template"
+msgstr ""
+
+#: js/settings-admin.js:45
+msgid "Saved"
+msgstr ""
+
+#: js/settings-admin.js:64 templates/settings-admin.php:33
+msgid "Reset"
+msgstr ""
+
+#: js/share.js:55
msgid "Shared by {owner}"
msgstr "由 {owner} 分享"
-#: js/sharedfilelist.js:116
+#: js/sharedfilelist.js:123
msgid "Shared by"
msgstr "由...分享"
-#: js/sharedfilelist.js:220
-msgid "link"
-msgstr ""
-
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "這個分享有密碼保護"
@@ -54,7 +62,7 @@ msgstr "這個分享有密碼保護"
msgid "The password is wrong. Try again."
msgstr "請檢查您的密碼並再試一次"
-#: templates/authenticate.php:10
+#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
msgstr "密碼"
@@ -90,15 +98,31 @@ msgstr "分享功能已停用"
msgid "For more info, please ask the person who sent this link."
msgstr "請詢問告訴您此連結的人以瞭解更多"
-#: templates/public.php:21
+#: templates/public.php:20
msgid "Download"
msgstr "下載"
-#: templates/public.php:52
+#: templates/public.php:50
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:56
+#: templates/public.php:54
msgid "Direct link"
msgstr ""
+
+#: templates/settings-admin.php:3
+msgid "Mail templates"
+msgstr ""
+
+#: templates/settings-admin.php:8
+msgid "Theme"
+msgstr ""
+
+#: templates/settings-admin.php:17
+msgid "Template"
+msgstr ""
+
+#: templates/settings-admin.php:35
+msgid "Save"
+msgstr ""
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index bf6c1fc28be331790628d2f3d100730c239bac7a..e368e051afea8185cb6faa247bc414eebae64e3c 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# v998 <keroro20054@gmail.com>, 2014
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# happy chan <keroro20054@gmail.com>, 2014
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-05 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:714
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:715
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -455,3 +455,8 @@ msgstr "一定要提供一個有效的密碼"
#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
+
+#: public/files/locknotacquiredexception.php:39
+#, php-format
+msgid "Could not obtain lock type %d on \"%s\"."
+msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index aaff0327906f71711f95ce50d8bbeb51d31c0b91..5cbbe5d730215f8028d6ef987b6efba47c06955d 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -4,13 +4,13 @@
#
# Translators:
# akong <akong@aspa.idv.tw>, 2014
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "刪除"
#: js/users/users.js:84 templates/users/part.userlist.php:98
msgid "never"
-msgstr ""
+msgstr "永不"
#: js/users/users.js:371
msgid "add group"
@@ -743,7 +743,7 @@ msgstr ""
#: templates/apps.php:60
msgid "All"
-msgstr ""
+msgstr "所有"
#: templates/help.php:13
msgid "Administrator Documentation"
@@ -929,7 +929,7 @@ msgstr ""
#: templates/users/part.setquota.php:7
msgid "Default Quota"
-msgstr ""
+msgstr "預設容量限制"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -949,7 +949,7 @@ msgstr "使用者名稱"
#: templates/users/part.userlist.php:14
msgid "Quota"
-msgstr ""
+msgstr "容量限制"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index d6926cff247bd0b17ac27e2ee86496cb0b1298fb..be9ddc66f64abc0400ff59f3f51c89a72d01c38c 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# chenanyeh <chnjsn1221@gmail.com>, 2013
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# Chen-An Yeh <chnjsn1221@gmail.com>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index bb91b36f1a8a41dc32c2c0b4a2a8c3d9be8c49a9..974ef56399f355921b914772af4b9189e1155600 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Hydriz <admin@alphacorp.tk>, 2013
-# sy6614 <sy6614@yahoo.com.hk>, 2013
-# chenanyeh <chnjsn1221@gmail.com>, 2013
-# Hydriz <admin@alphacorp.tk>, 2013
-# pellaeon <nfsmwlin@gmail.com>, 2013
-# sofiasu <sofia168@livemail.tw>, 2012
+# Hydriz Scholz <admin@alphacorp.tk>, 2013
+# Andy Lam <sy6614@yahoo.com.hk>, 2013
+# Chen-An Yeh <chnjsn1221@gmail.com>, 2013
+# Hydriz Scholz <admin@alphacorp.tk>, 2013
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
+# Sofia <sofia168@livemail.tw>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:55+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-04 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#: templates/settings.php:5
msgid "Save"
-msgstr ""
+msgstr "儲存"
#: templates/settings.php:6
msgid ""
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 8d7e1b69bd4e44f15dbd5d103bbfbebc57d352ed..15f6d8563d6c2021daf9871f560f19d8026b3a44 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -50,6 +50,7 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
"Sharing %s failed, because the file does not exist" => "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
+"You are not allowed to share %s" => "Oikeutesi eivät riitä kohteen %s jakamiseen.",
"Sharing %s failed, because the user %s is the item owner" => "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
"Sharing %s failed, because the user %s does not exist" => "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
"Sharing %s failed, because this item is already shared with %s" => "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 4c8b9c2b20d229ea70bb9c53a5085be89bf5b400..3a04e167ce703c76062e76b020b0ce8a7f33155e 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -21,7 +21,7 @@ $TRANSLATIONS = array(
"App does not provide an info.xml file" => "O aplicativo non fornece un ficheiro info.xml",
"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar o aplicativo por mor de conter código non permitido",
"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta <shipped>true</shipped> que non está permitida para os aplicativos non expedidos",
"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
"App directory already exists" => "Xa existe o directorio do aplicativo",
"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s",
@@ -39,18 +39,18 @@ $TRANSLATIONS = array(
"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
"MySQL/MariaDB username and/or password not valid" => "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto",
"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
-"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
+"Offending command was: \"%s\"" => "A orde infractora foi: «%s»",
"MySQL/MariaDB user '%s'@'localhost' exists already." => "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB.",
"Drop this user from MySQL/MariaDB" => "Eliminar este usuario do MySQL/MariaDB",
"MySQL/MariaDB user '%s'@'%%' already exists" => "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB",
"Drop this user from MySQL/MariaDB." => "Eliminar este usuario do MySQL/MariaDB.",
"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
-"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
+"Offending command was: \"%s\", name: %s, password: %s" => "A orde infractora foi: «%s», nome: %s, contrasinal: %s",
"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
"Set an admin username." => "Estabeleza un nome de usuario administrador",
"Set an admin password." => "Estabeleza un contrasinal de administrador",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
"Sharing %s failed, because the file does not exist" => "Fallou a compartición de %s, o ficheiro non existe",
@@ -69,7 +69,7 @@ $TRANSLATIONS = array(
"Sharing backend %s must implement the interface OCP\\Share_Backend" => "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend",
"Sharing backend %s not found" => "Non se atopou a infraestrutura de compartición %s",
"Sharing backend for %s not found" => "Non se atopou a infraestrutura de compartición para %s",
-"Sharing %s failed, because the user %s is the original sharer" => "Fallou a compartición de %s, compartición orixinal é do usuario %s",
+"Sharing %s failed, because the user %s is the original sharer" => "Fallou a compartición de %s, a compartición orixinal é do usuario %s",
"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s",
"Sharing %s failed, because resharing is not allowed" => "Fallou a compartición de %s, non está permitido repetir a compartción",
"Sharing %s failed, because the sharing backend for %s could not find its source" => "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe",
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 73c94f2f699c598615572b8feea4ec78f84a1801..bc6294ac078dceb30990e07ac313ac63e41faa0e 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"You are accessing the server from an untrusted domain." => "あなたはサーバに、信用が付与されていないドメインからアクセスしています。",
+"You are accessing the server from an untrusted domain." => "信頼されていないドメインからサーバーにアクセスしています。",
"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
"No app name specified" => "アプリ名が未指定",
@@ -68,7 +68,7 @@ $TRANSLATIONS = array(
"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。",
"Sharing backend %s not found" => "共有バックエンド %s が見つかりません",
"Sharing backend for %s not found" => "%s のための共有バックエンドが見つかりません",
-"Sharing %s failed, because the user %s is the original sharer" => "%s の共有に失敗しました。ユーザ %s が元々の共有者であるからです。",
+"Sharing %s failed, because the user %s is the original sharer" => "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s の共有に失敗しました。%s に付与されている許可を超えているからです。",
"Sharing %s failed, because resharing is not allowed" => "%s の共有に失敗しました。再共有が許されていないからです。",
"Sharing %s failed, because the sharing backend for %s could not find its source" => "%s の共有に失敗しました。%s のバックエンド共有に必要なソースが見つかりませんでした。",
@@ -87,6 +87,6 @@ $TRANSLATIONS = array(
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "ユーザー名で利用できる文字列は、次のものです： \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
"A valid password must be provided" => "有効なパスワードを指定する必要があります",
-"The username is already being used" => "ユーザ名はすでに使われています"
+"The username is already being used" => "ユーザー名はすでに使われています"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index f637abea6e8a2b66fa458635fbd54751512cf465..9be19f04fcac0ac05154dcad7c3ab6adde868c3a 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
"Groups" => "مجموعات",
"Group Admin" => "مدير المجموعة",
"Delete" => "إلغاء",
+"never" => "بتاتا",
"add group" => "اضافة مجموعة",
"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
"Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
@@ -117,6 +118,7 @@ $TRANSLATIONS = array(
"Documentation:" => "التوثيق",
"See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>",
+"All" => "الكل",
"Administrator Documentation" => "كتاب توثيق المدير",
"Online Documentation" => "توثيق متوفر على الشبكة",
"Forum" => "منتدى",
@@ -151,10 +153,13 @@ $TRANSLATIONS = array(
"Create" => "انشئ",
"Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
"Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
+"Group" => "مجموعة",
+"Default Quota" => "الحصة النسبية الإفتراضية",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او \"12 GB\")",
"Unlimited" => "غير محدود",
"Other" => "شيء آخر",
"Username" => "إسم المستخدم",
+"Quota" => "حصه",
"change full name" => "تغيير اسمك الكامل",
"set new password" => "اعداد كلمة مرور جديدة",
"Default" => "افتراضي"
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index f23f8e8d873d6354ee211b5a2092f7a8cf4ed476..0513589482f6a78ec724c88905197e11d0c2f851 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -61,11 +61,13 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
"Delete encryption keys permanently." => "Desanciar dafechu les claves de cifráu.",
"Restore encryption keys." => "Restaurar claves de cifráu.",
+"Unable to delete " => "Nun pue desaniciase",
"deleted" => "desaniciáu",
"undo" => "desfacer",
"Groups" => "Grupos",
"Group Admin" => "Alministrador del Grupu",
"Delete" => "Desaniciar",
+"never" => "enxamás",
"add group" => "amestar Grupu",
"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
"Error creating user" => "Fallu al crear usuariu",
@@ -128,6 +130,7 @@ $TRANSLATIONS = array(
"Email Server" => "Sirvidor de corréu-e",
"This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
"From address" => "Dende la direición",
+"mail" => "corréu",
"Authentication required" => "Necesítase autenticación",
"Server address" => "Direición del sirvidor",
"Port" => "Puertu",
@@ -149,6 +152,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Ver la páxina d'aplicaciones en apps.owncloud.com",
"See application website" => "Ver sitiu web de l'aplicación",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-llicencia otorgada por <span class=\"author\"></span>",
+"All" => "Toos",
"Administrator Documentation" => "Documentación d'alministrador",
"Online Documentation" => "Documentación en llinia",
"Forum" => "Foru",
@@ -186,10 +190,15 @@ $TRANSLATIONS = array(
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
"Enter the recovery password in order to recover the users files during password change" => "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+"Add Group" => "Amestar grupu",
+"Group" => "Grupu",
+"Everyone" => "Toos",
+"Admins" => "Almins",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
"Unlimited" => "Non llendáu",
"Other" => "Otru",
"Username" => "Nome d'usuariu",
+"Last Login" => "Aniciu de sesión caberu",
"change full name" => "camudar el nome completu",
"set new password" => "afitar nueva contraseña",
"Default" => "Predetermináu"
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6d927ece5a6753ee27b993e49ca3d8e032531f91..93529b3a3c89ee3086ce4ab7d6997eec035cdb10 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -24,6 +24,7 @@ $TRANSLATIONS = array(
"undo" => "възтановяване",
"Groups" => "Групи",
"Delete" => "Изтриване",
+"never" => "никога",
"add group" => "нова група",
"__language_name__" => "__language_name__",
"None" => "Няма",
@@ -56,9 +57,11 @@ $TRANSLATIONS = array(
"Help translate" => "Помогнете с превода",
"Login Name" => "Потребител",
"Create" => "Създаване",
+"Default Quota" => "Квота по подразбиране",
"Unlimited" => "Неограничено",
"Other" => "Други",
"Username" => "Потребител",
+"Quota" => "Квота",
"Default" => "По подразбиране"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 68cba2fd6fed3052f46e26059afc7385c650f8e4..a5f52992ebec45553baacbd33f1359564633efdb 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -24,6 +24,7 @@ $TRANSLATIONS = array(
"Groups" => "গোষ্ঠীসমূহ",
"Group Admin" => "গোষ্ঠী প্রশাসক",
"Delete" => "মুছে",
+"never" => "কখনোই নয়",
"__language_name__" => "__language_name__",
"None" => "কোনটিই নয়",
"Login" => "প্রবেশ",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 88a366ce79a013f8ce74d7c8fd50e48835637b7f..c2ba3c7403ff934e229f9e00ee2475de24ecf51a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
"Groups" => "Grups",
"Group Admin" => "Grup Admin",
"Delete" => "Esborra",
+"never" => "mai",
"add group" => "afegeix grup",
"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
"Error creating user" => "Error en crear l'usuari",
@@ -139,6 +140,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
"See application website" => "Mostra la web de l'aplicació",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
+"All" => "Tots",
"Administrator Documentation" => "Documentació d'administrador",
"Online Documentation" => "Documentació en línia",
"Forum" => "Fòrum",
@@ -174,10 +176,13 @@ $TRANSLATIONS = array(
"Create" => "Crea",
"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
"Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+"Group" => "Grup",
+"Default Quota" => "Quota per defecte",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
"Unlimited" => "Il·limitat",
"Other" => "Un altre",
"Username" => "Nom d'usuari",
+"Quota" => "Quota",
"change full name" => "canvia el nom complet",
"set new password" => "estableix nova contrasenya",
"Default" => "Per defecte"
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6d091d5977c1554e190f23ee7e2b6aa6ef966343..e2ff2bbeaaf6efccb8f5abfb0df77c9f4e93bcb8 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Skupiny",
"Group Admin" => "Správa skupiny",
"Delete" => "Smazat",
+"never" => "nikdy",
"add group" => "přidat skupinu",
"A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
"Error creating user" => "Chyba při vytváření užiatele",
@@ -153,6 +154,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
"See application website" => "Prohlédněte si webovou stránku aplikace",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
+"All" => "Vše",
"Administrator Documentation" => "Dokumentace správce",
"Online Documentation" => "Online dokumentace",
"Forum" => "Fórum",
@@ -191,10 +193,13 @@ $TRANSLATIONS = array(
"Create" => "Vytvořit",
"Admin Recovery Password" => "Heslo obnovy správce",
"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+"Group" => "Skupina",
+"Default Quota" => "Výchozí kvóta",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
"Unlimited" => "Neomezeně",
"Other" => "Jiný",
"Username" => "Uživatelské jméno",
+"Quota" => "Kvóta",
"change full name" => "změnit celé jméno",
"set new password" => "nastavit nové heslo",
"Default" => "Výchozí"
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 5beeeadae968a2a185275b68817fc32522c2fd0e..b99541b6cf589133c6b29dc2cd0efcfda1123fc5 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"undo" => "dadwneud",
"Groups" => "Grwpiau",
"Delete" => "Dileu",
+"never" => "byth",
"None" => "Dim",
"Login" => "Mewngofnodi",
"Security Warning" => "Rhybudd Diogelwch",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 5b6a8d3d717be50365d98e97427da16508046e6e..e5cfe0412ce8372728958e760fc4cda8cee1d1b5 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -52,6 +52,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupper",
"Group Admin" => "Gruppe Administrator",
"Delete" => "Slet",
+"never" => "aldrig",
"add group" => "Tilføj gruppe",
"A valid username must be provided" => "Et gyldigt brugernavn skal angives",
"Error creating user" => "Fejl ved oprettelse af bruger",
@@ -126,6 +127,7 @@ $TRANSLATIONS = array(
"Documentation:" => "Dokumentation:",
"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
+"All" => "Alle",
"Administrator Documentation" => "Administrator Dokumentation",
"Online Documentation" => "Online dokumentation",
"Forum" => "Forum",
@@ -160,10 +162,13 @@ $TRANSLATIONS = array(
"Create" => "Ny",
"Admin Recovery Password" => "Administrator gendannelse kodeord",
"Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+"Group" => "Gruppe",
+"Default Quota" => "Standard kvote",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
"Unlimited" => "Ubegrænset",
"Other" => "Andet",
"Username" => "Brugernavn",
+"Quota" => "Kvote",
"change full name" => "ændre fulde navn",
"set new password" => "skift kodeord",
"Default" => "Standard"
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 7432f4bda9b8a87e5443289c05cfa7db9423ebe6..4eed8bfc51bfa8338eb56dcd443a6d201331a5a7 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -62,11 +62,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
+"Unable to delete " => "Löschen nicht möglich",
+"Error creating group" => "Fehler beim Erstellen der Gruppe",
+"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
"Delete" => "Löschen",
+"never" => "niemals",
"add group" => "Gruppe hinzufügen",
"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" => "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
@@ -92,6 +96,8 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+"Database Performance Info" => "Info zur Datenbankperformance",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
"Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
"Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
"See application website" => "Siehe Anwendungs-Website",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
+"All" => "Alle",
"Administrator Documentation" => "Dokumentation für Administratoren",
"Online Documentation" => "Online-Dokumentation",
"Forum" => "Forum",
@@ -194,10 +202,19 @@ $TRANSLATIONS = array(
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+"Search Users and Groups" => "Nutzer und Gruppen suchen",
+"Add Group" => "Gruppe hinzufügen",
+"Group" => "Gruppe",
+"Everyone" => "Jeder",
+"Admins" => "Administratoren",
+"Default Quota" => "Standard-Quota",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
"Username" => "Benutzername",
+"Quota" => "Quota",
+"Storage Location" => "Speicherort",
+"Last Login" => "Letzte Anmeldung",
"change full name" => "Vollständigen Namen ändern",
"set new password" => "Neues Passwort setzen",
"Default" => "Standard"
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index d31b9ad151a4890124e7ed558389dd0fd670800b..c1542941577e7caf766a978ed62f2b8e230d119c 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Invalid request" => "Fehlerhafte Anfrage",
"Delete" => "Löschen",
+"never" => "niemals",
"__language_name__" => "Deutsch (Österreich)",
"Server address" => "Adresse des Servers",
"Password" => "Passwort",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index d796d1b261b992852a843f4eeabaf733453a4c30..4174f36a5948f2729f44c6a48c07f19f2d7a1b34 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
"Delete" => "Löschen",
+"never" => "niemals",
"add group" => "Gruppe hinzufügen",
"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
@@ -79,6 +80,7 @@ $TRANSLATIONS = array(
"Select an App" => "Wählen Sie eine Anwendung aus",
"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"All" => "Alle",
"Administrator Documentation" => "Dokumentation für Administratoren",
"Online Documentation" => "Online-Dokumentation",
"Forum" => "Forum",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 75c3824e5b24b5b66e7159ce586522db6af995f2..793d141a165a095bae99249b81d167c66fbdb868 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -62,11 +62,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
+"Unable to delete " => "Löschen nicht möglich",
+"Error creating group" => "Fehler beim Erstellen der Gruppe",
+"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
"Delete" => "Löschen",
+"never" => "niemals",
"add group" => "Gruppe hinzufügen",
"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
@@ -92,6 +96,8 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+"Database Performance Info" => "Info zur Datenbankperformance",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
"Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
"See application website" => "Siehe Anwendungs-Website",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
+"All" => "Alle",
"Administrator Documentation" => "Dokumentation für Administratoren",
"Online Documentation" => "Online-Dokumentation",
"Forum" => "Forum",
@@ -194,10 +202,19 @@ $TRANSLATIONS = array(
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+"Search Users and Groups" => "Nutzer und Gruppen suchen",
+"Add Group" => "Gruppe hinzufügen",
+"Group" => "Gruppe",
+"Everyone" => "Jeder",
+"Admins" => "Administratoren",
+"Default Quota" => "Standard-Quota",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
"Username" => "Benutzername",
+"Quota" => "Quota",
+"Storage Location" => "Speicherort",
+"Last Login" => "Letzte Anmeldung",
"change full name" => "Vollständigen Namen ändern",
"set new password" => "Neues Passwort setzen",
"Default" => "Standard"
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3aa1741983c67be94471fd5d01375565e058d4ec..f9822837a8cc6c49f5ed5ba0a662381d081b24e8 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Ομάδες",
"Group Admin" => "Ομάδα Διαχειριστών",
"Delete" => "Διαγραφή",
+"never" => "ποτέ",
"add group" => "προσθήκη ομάδας",
"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
"Error creating user" => "Σφάλμα δημιουργίας χρήστη",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
"See application website" => "Δείτε την ιστοσελίδα της εφαρμογής",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>",
+"All" => "Όλες",
"Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
"Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
"Forum" => "Φόρουμ",
@@ -192,10 +194,13 @@ $TRANSLATIONS = array(
"Create" => "Δημιουργία",
"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
"Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
+"Group" => "Ομάδα",
+"Default Quota" => "Προεπιλεγμένο Όριο",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\" ή \"12 GB\")",
"Unlimited" => "Απεριόριστο",
"Other" => "Άλλο",
"Username" => "Όνομα χρήστη",
+"Quota" => "Σύνολο Χώρου",
"change full name" => "αλλαγή πλήρους ονόματος",
"set new password" => "επιλογή νέου κωδικού",
"Default" => "Προκαθορισμένο"
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 26f565c589a561ba132f1b6a7ef45ea6d3372601..a267093ab922d5347407d535f8739f884a42bb42 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Groups",
"Group Admin" => "Group Admin",
"Delete" => "Delete",
+"never" => "never",
"add group" => "add group",
"A valid username must be provided" => "A valid username must be provided",
"Error creating user" => "Error creating user",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
"See application website" => "See application website",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"All" => "All",
"Administrator Documentation" => "Administrator Documentation",
"Online Documentation" => "Online Documentation",
"Forum" => "Forum",
@@ -194,6 +196,7 @@ $TRANSLATIONS = array(
"Create" => "Create",
"Admin Recovery Password" => "Admin Recovery Password",
"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
+"Group" => "Group",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
"Unlimited" => "Unlimited",
"Other" => "Other",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 14a47fa72dd13f0c96bd506f95ada2e9e4dd70c2..d1413e7d039cee2992598709890e2eed19f41e30 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupoj",
"Group Admin" => "Grupadministranto",
"Delete" => "Forigi",
+"never" => "neniam",
"add group" => "aldoni grupon",
"A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
"Error creating user" => "Eraris kreo de uzanto",
@@ -99,6 +100,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
"See application website" => "Vidi la TTT-ejon de la aplikaĵo",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"All" => "Ĉio",
"Administrator Documentation" => "Dokumentaro por administrantoj",
"Online Documentation" => "Reta dokumentaro",
"Forum" => "Forumo",
@@ -130,9 +132,12 @@ $TRANSLATIONS = array(
"Delete Encryption Keys" => "Forigi ĉifroklavojn",
"Login Name" => "Ensaluti",
"Create" => "Krei",
+"Group" => "Grupo",
+"Default Quota" => "Defaŭlta kvoto",
"Unlimited" => "Senlima",
"Other" => "Alia",
"Username" => "Uzantonomo",
+"Quota" => "Kvoto",
"change full name" => "ŝanĝi plenan nomon",
"set new password" => "agordi novan pasvorton",
"Default" => "Defaŭlta"
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 9765e54dfe5fe1213744289190a2dc4fca52f331..9398e3b29b4f8392a1c50f8f551fd10b250aed32 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupos",
"Group Admin" => "Administrador del Grupo",
"Delete" => "Eliminar",
+"never" => "nunca",
"add group" => "añadir Grupo",
"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
"Error creating user" => "Error al crear usuario",
@@ -155,6 +156,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
"See application website" => "Ver sitio web de la aplicación",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"All" => "Todos",
"Administrator Documentation" => "Documentación de administrador",
"Online Documentation" => "Documentación en línea",
"Forum" => "Foro",
@@ -193,10 +195,13 @@ $TRANSLATIONS = array(
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+"Group" => "Grupo",
+"Default Quota" => "Cuota predeterminada",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
"Unlimited" => "Ilimitado",
"Other" => "Otro",
"Username" => "Nombre de usuario",
+"Quota" => "Cuota",
"change full name" => "cambiar el nombre completo",
"set new password" => "establecer nueva contraseña",
"Default" => "Predeterminado"
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 3060ccd2f86fc63b5f7ec628c610f8229db96ef2..37f87bf3bfa92889d8fe809febf72dd24e3f3ac8 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrador",
"Delete" => "Borrar",
+"never" => "nunca",
"add group" => "agregar grupo",
"A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
"Error creating user" => "Error creando usuario",
@@ -135,6 +136,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
"See application website" => "Ver sitio web de la aplicación",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
+"All" => "Todos",
"Administrator Documentation" => "Documentación de Administrador",
"Online Documentation" => "Documentación en línea",
"Forum" => "Foro",
@@ -170,10 +172,13 @@ $TRANSLATIONS = array(
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de contraseña de administrador",
"Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
+"Group" => "Grupo",
+"Default Quota" => "Cuota predeterminada",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
"Unlimited" => "Ilimitado",
"Other" => "Otros",
"Username" => "Nombre de usuario",
+"Quota" => "Cuota",
"change full name" => "Cambiar nombre completo",
"set new password" => "Configurar nueva contraseña",
"Default" => "Predeterminado"
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 09fa58935f7dabaf3f86d2a9f5ce9f9b12e20446..d3e4065b5c27fae053d94e29255821739ad1c687 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupos",
"Group Admin" => "Administrador del Grupo",
"Delete" => "Eliminar",
+"never" => "nunca",
"add group" => "añadir Grupo",
"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
"Error creating user" => "Error al crear usuario",
@@ -102,6 +103,7 @@ $TRANSLATIONS = array(
"Select an App" => "Seleccionar una aplicación",
"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"All" => "Todos",
"Administrator Documentation" => "Documentación de administrador",
"Online Documentation" => "Documentación en línea",
"Forum" => "Foro",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index b9e1719bf17be205f67f33ec85ff22f1f622fa2f..59002373e0414331ea5e5d4378b8922f69c85bd9 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupid",
"Group Admin" => "Grupi admin",
"Delete" => "Kustuta",
+"never" => "mitte kunagi",
"add group" => "lisa grupp",
"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
"Error creating user" => "Viga kasutaja loomisel",
@@ -142,6 +143,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
"See application website" => "Vaata rakendi veebilehte",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
+"All" => "Kõik",
"Administrator Documentation" => "Administraatori dokumentatsioon",
"Online Documentation" => "Online dokumentatsioon",
"Forum" => "Foorum",
@@ -177,10 +179,13 @@ $TRANSLATIONS = array(
"Create" => "Lisa",
"Admin Recovery Password" => "Admini parooli taastamine",
"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+"Group" => "Grupp",
+"Default Quota" => "Vaikimisi kvoot",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
"Unlimited" => "Piiramatult",
"Other" => "Muu",
"Username" => "Kasutajanimi",
+"Quota" => "Mahupiir",
"change full name" => "Muuda täispikka nime",
"set new password" => "määra uus parool",
"Default" => "Vaikeväärtus"
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 896d14b0191b9e4becc1208e0d2e7af5060ae3c5..f96733d0b1c25367efd9db11598294a9445f73fd 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
"Groups" => "Taldeak",
"Group Admin" => "Talde administradorea",
"Delete" => "Ezabatu",
+"never" => "inoiz",
"add group" => "gehitu taldea",
"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
"Error creating user" => "Errore bat egon da erabiltzailea sortzean",
@@ -102,6 +103,7 @@ $TRANSLATIONS = array(
"Select an App" => "Aukeratu programa bat",
"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
+"All" => "Denak",
"Administrator Documentation" => "Administradore dokumentazioa",
"Online Documentation" => "Online dokumentazioa",
"Forum" => "Foroa",
@@ -135,10 +137,13 @@ $TRANSLATIONS = array(
"Create" => "Sortu",
"Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
"Enter the recovery password in order to recover the users files during password change" => "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+"Group" => "Taldea",
+"Default Quota" => "Kuota lehentsia",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
"Unlimited" => "Mugarik gabe",
"Other" => "Bestelakoa",
"Username" => "Erabiltzaile izena",
+"Quota" => "Kuota",
"change full name" => "aldatu izena",
"set new password" => "ezarri pasahitz berria",
"Default" => "Lehenetsia"
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 9f1de1d9e1385df3878fbe60ac6bba84d9400b85..2575ff4e1a80dd8d57c8117a5da4cb7a201bf3fc 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
"Groups" => "گروه ها",
"Group Admin" => "گروه مدیران",
"Delete" => "حذف",
+"never" => "هرگز",
"add group" => "افزودن گروه",
"A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
"Error creating user" => "خطا در ایجاد کاربر",
@@ -95,6 +96,7 @@ $TRANSLATIONS = array(
"Select an App" => "یک برنامه انتخاب کنید",
"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>",
+"All" => "همه",
"Administrator Documentation" => "مستندات مدیر",
"Online Documentation" => "مستندات آنلاین",
"Forum" => "انجمن",
@@ -127,9 +129,11 @@ $TRANSLATIONS = array(
"Create" => "ایجاد کردن",
"Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
"Enter the recovery password in order to recover the users files during password change" => "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
+"Default Quota" => "سهم پیش فرض",
"Unlimited" => "نامحدود",
"Other" => "دیگر",
"Username" => "نام کاربری",
+"Quota" => "سهم",
"set new password" => "تنظیم کلمه عبور جدید",
"Default" => "پیش فرض"
);
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 53e2e75ccb0499678f29c7fd33e1f24f7d18cc71..144ebdad225413b05e82c54530b678815fcb8a0b 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -56,11 +56,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
"Restore encryption keys." => "Palauta salausavaimet.",
+"Unable to delete " => "Poistaminen epäonnistui",
+"Error creating group" => "Virhe ryhmää luotaessa",
+"A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
"deleted" => "poistettu",
"undo" => "kumoa",
"Groups" => "Ryhmät",
"Group Admin" => "Ryhmän ylläpitäjä",
"Delete" => "Poista",
+"never" => "ei koskaan",
"add group" => "lisää ryhmä",
"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
"Error creating user" => "Virhe käyttäjää luotaessa",
@@ -81,6 +85,8 @@ $TRANSLATIONS = array(
"Setup Warning" => "Asetusvaroitus",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
+"Database Performance Info" => "Tietokannan suorituskyvyn tiedot",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
"Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
"Your PHP version is outdated" => "Käytössä oleva PHP-versio on vanhentunut",
@@ -140,6 +146,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
"See application website" => "Lue lisää sovelluksen sivustolta",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
+"Enable only for specific groups" => "Salli vain tietyille ryhmille",
+"All" => "Kaikki",
"Administrator Documentation" => "Ylläpito-ohjeistus",
"Online Documentation" => "Verkko-ohjeistus",
"Forum" => "Keskustelupalsta",
@@ -175,10 +183,19 @@ $TRANSLATIONS = array(
"Delete Encryption Keys" => "Poista salausavaimet",
"Login Name" => "Kirjautumisnimi",
"Create" => "Luo",
+"Search Users and Groups" => "Etsi käyttäjiä ja ryhmiä",
+"Add Group" => "Lisää ryhmä",
+"Group" => "Ryhmä",
+"Everyone" => "Kaikki",
+"Admins" => "Ylläpitäjät",
+"Default Quota" => "Oletuskiintiö",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
"Unlimited" => "Rajoittamaton",
"Other" => "Muu",
"Username" => "Käyttäjätunnus",
+"Quota" => "Kiintiö",
+"Storage Location" => "Tallennustilan sijainti",
+"Last Login" => "Viimeisin kirjautuminen",
"change full name" => "muuta koko nimi",
"set new password" => "aseta uusi salasana",
"Default" => "Oletus"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index d706edb6c4ede7f6496b502611ffa2bcf9e289d1..58ddda4ffd2e7ee73998bdc3255dff12b5fcc3e8 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Groupes",
"Group Admin" => "Admin Groupe",
"Delete" => "Supprimer",
+"never" => "jamais",
"add group" => "ajouter un groupe",
"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
"Error creating user" => "Erreur lors de la création de l'utilisateur",
@@ -155,6 +156,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
"See application website" => "Voir le site web de l'application",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
+"All" => "Tous",
"Administrator Documentation" => "Documentation administrateur",
"Online Documentation" => "Documentation en ligne",
"Forum" => "Forum",
@@ -193,10 +195,13 @@ $TRANSLATIONS = array(
"Create" => "Créer",
"Admin Recovery Password" => "Récupération du mot de passe administrateur",
"Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+"Group" => "Groupe",
+"Default Quota" => "Quota par défaut",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
"Unlimited" => "Illimité",
"Other" => "Autre",
"Username" => "Nom d'utilisateur",
+"Quota" => "Quota",
"change full name" => "Modifier le nom complet",
"set new password" => "Changer le mot de passe",
"Default" => "Défaut"
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 818ed728d01da9ec2eadb900c9459d1b7b4a5e0b..aba604681da4e33b246750d0e67cf3aca46be023 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -62,11 +62,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
"Restore encryption keys." => "Restaurar as chaves de cifrado.",
+"Unable to delete " => "Non se pode eliminar",
+"Error creating group" => "Produciuse un erro ao crear o grupo",
+"A valid group name must be provided" => "Debe fornecer un nome de grupo",
"deleted" => "eliminado",
"undo" => "desfacer",
"Groups" => "Grupos",
"Group Admin" => "Grupo Admin",
"Delete" => "Eliminar",
+"never" => "nunca",
"add group" => "engadir un grupo",
"A valid username must be provided" => "Debe fornecer un nome de usuario",
"Error creating user" => "Produciuse un erro ao crear o usuario",
@@ -92,6 +96,8 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Volva comprobar as <a href=\"%s\">guías de instalación</a>",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varios aplicativos sexan inaccesíbeis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
+"Database Performance Info" => "Información do rendemento da base de datos",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
"Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
"Your PHP version is outdated" => "A versión de PHP está desactualizada",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Consulte a páxina do aplicativo en apps.owncloud.com",
"See application website" => "Vexa o sitio web do aplicativo",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
+"Enable only for specific groups" => "Activar só para grupos específicos",
+"All" => "Todo",
"Administrator Documentation" => "Documentación do administrador",
"Online Documentation" => "Documentación na Rede",
"Forum" => "Foro",
@@ -194,10 +202,19 @@ $TRANSLATIONS = array(
"Create" => "Crear",
"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
"Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
+"Search Users and Groups" => "Buscar usuarios e grupos",
+"Add Group" => "Engadir un grupo",
+"Group" => "Grupo",
+"Everyone" => "Todos",
+"Admins" => "Administradores",
+"Default Quota" => "Cota por omisión",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
"Unlimited" => "Sen límites",
"Other" => "Outro",
"Username" => "Nome de usuario",
+"Quota" => "Cota",
+"Storage Location" => "Localización do almacenamento",
+"Last Login" => "Último acceso",
"change full name" => "Cambiar o nome completo",
"set new password" => "estabelecer un novo contrasinal",
"Default" => "Predeterminado"
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index e44b559ae836ef559623d7e3d3f6f6929be9eebd..6f317a9d88711d379a02536166a67220c0f92063 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Groups" => "קבוצות",
"Group Admin" => "מנהל הקבוצה",
"Delete" => "מחיקה",
+"never" => "לעולם לא",
"add group" => "הוספת קבוצה",
"A valid username must be provided" => "יש לספק שם משתמש תקני",
"Error creating user" => "יצירת המשתמש נכשלה",
@@ -70,6 +71,7 @@ $TRANSLATIONS = array(
"Select an App" => "בחירת יישום",
"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
+"All" => "הכל",
"Administrator Documentation" => "תיעוד מנהלים",
"Online Documentation" => "תיעוד מקוון",
"Forum" => "פורום",
@@ -93,9 +95,12 @@ $TRANSLATIONS = array(
"Login Name" => "שם כניסה",
"Create" => "יצירה",
"Admin Recovery Password" => "ססמת השחזור של המנהל",
+"Group" => "קבוצה",
+"Default Quota" => "מכסת בררת המחדל",
"Unlimited" => "ללא הגבלה",
"Other" => "אחר",
"Username" => "שם משתמש",
+"Quota" => "מכסה",
"set new password" => "הגדרת ססמה חדשה",
"Default" => "בררת מחדל"
);
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index d0b19c3c3c4a4f28811f99cd05279832d6df2303..3904b1b0e9d3ee134165490327d608300d940630 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -14,6 +14,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupe",
"Group Admin" => "Grupa Admin",
"Delete" => "Obriši",
+"never" => "nikad",
"__language_name__" => "__ime_jezika__",
"Login" => "Prijava",
"Cron" => "Cron",
@@ -34,7 +35,10 @@ $TRANSLATIONS = array(
"Help translate" => "Pomoć prevesti",
"Login Name" => "Prijava",
"Create" => "Izradi",
+"Group" => "Grupa",
+"Default Quota" => "standardni kvota",
"Other" => "ostali",
-"Username" => "Korisničko ime"
+"Username" => "Korisničko ime",
+"Quota" => "kvota"
);
$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index ff0bcbab6a9977a3b2f623c33147d7b63b71e562..c7dc45504e8a8a80a23737514f4eb94539ea3651 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Groups" => "Csoportok",
"Group Admin" => "Csoportadminisztrátor",
"Delete" => "Törlés",
+"never" => "soha",
"add group" => "csoport hozzáadása",
"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
"Error creating user" => "A felhasználó nem hozható létre",
@@ -112,6 +113,7 @@ $TRANSLATIONS = array(
"Select an App" => "Válasszon egy alkalmazást",
"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
+"All" => "Mind",
"Administrator Documentation" => "Üzemeltetői leírás",
"Online Documentation" => "Online leírás",
"Forum" => "Fórum",
@@ -146,10 +148,13 @@ $TRANSLATIONS = array(
"Create" => "Létrehozás",
"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+"Group" => "Csoport",
+"Default Quota" => "Alapértelmezett kvóta",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Kérjük adja meg a tárolási kvótát (pl. \"512 MB\" vagy \"12 GB\")",
"Unlimited" => "Korlátlan",
"Other" => "Más",
"Username" => "Felhasználónév",
+"Quota" => "Kvóta",
"change full name" => "a teljes név megváltoztatása",
"set new password" => "új jelszó beállítása",
"Default" => "Alapértelmezett"
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 0230b3921f826f883a2244eb8637bd3ed139f42e..99d08df7b8fbcd96e251085943af8d010f9edb8c 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Strong password" => "Contrasigno forte",
"Groups" => "Gruppos",
"Delete" => "Deler",
+"never" => "nunquam",
"__language_name__" => "Interlingua",
"Security Warning" => "Aviso de securitate",
"Log" => "Registro",
@@ -31,7 +32,10 @@ $TRANSLATIONS = array(
"Language" => "Linguage",
"Help translate" => "Adjuta a traducer",
"Create" => "Crear",
+"Group" => "Gruppo",
+"Default Quota" => "Quota predeterminate",
"Other" => "Altere",
-"Username" => "Nomine de usator"
+"Username" => "Nomine de usator",
+"Quota" => "Quota"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 64d6ed8e25b7e4cd618df110dce817bad4b645c5..7a18a12ca3d8c2550bfe2e6d203fc5237fb9279a 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -48,6 +48,7 @@ $TRANSLATIONS = array(
"Groups" => "Grup",
"Group Admin" => "Admin Grup",
"Delete" => "Hapus",
+"never" => "tidak pernah",
"add group" => "tambah grup",
"A valid username must be provided" => "Tuliskan nama pengguna yang valid",
"Error creating user" => "Gagal membuat pengguna",
@@ -107,6 +108,7 @@ $TRANSLATIONS = array(
"Select an App" => "Pilih Aplikasi",
"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
+"All" => "Semua",
"Administrator Documentation" => "Dokumentasi Administrator",
"Online Documentation" => "Dokumentasi Online",
"Forum" => "Forum",
@@ -141,10 +143,13 @@ $TRANSLATIONS = array(
"Create" => "Buat",
"Admin Recovery Password" => "Sandi pemulihan Admin",
"Enter the recovery password in order to recover the users files during password change" => "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+"Group" => "Grup",
+"Default Quota" => "Kuota default",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
"Unlimited" => "Tak terbatas",
"Other" => "Lainnya",
"Username" => "Nama pengguna",
+"Quota" => "Quota",
"change full name" => "ubah nama lengkap",
"set new password" => "setel sandi baru",
"Default" => "Baku"
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 1226925dc249bcf9098a4ef3e1f6f7049bfd3ab2..ae57a00d6a15ac2e4f3ffa4da05012ea71865550 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Groups" => "Hópar",
"Group Admin" => "Hópstjóri",
"Delete" => "Eyða",
+"never" => "aldrei",
"__language_name__" => "__nafn_tungumáls__",
"None" => "Ekkert",
"Security Warning" => "Öryggis aðvörun",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index de1ba858eaccf9a0eb294b2a3cf4c97899b5d116..44114d390e377be9fc2d9286d6bd90723f9c1087 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -62,11 +62,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
+"Unable to delete " => "Impossibile eliminare",
+"Error creating group" => "Errore durante la creazione del gruppo",
+"A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
"deleted" => "eliminati",
"undo" => "annulla",
"Groups" => "Gruppi",
"Group Admin" => "Gruppi amministrati",
"Delete" => "Elimina",
+"never" => "mai",
"add group" => "aggiungi gruppo",
"A valid username must be provided" => "Deve essere fornito un nome utente valido",
"Error creating user" => "Errore durante la creazione dell'utente",
@@ -90,6 +94,10 @@ $TRANSLATIONS = array(
"Setup Warning" => "Avviso di configurazione",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Sembra che PHP sia configurato per rimuovere i blocchi in linea della documentazione. Ciò renderà inaccessibili diverse applicazioni principali.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
+"Database Performance Info" => "Informazioni prestazioni del database",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
"Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
"Your PHP version is outdated" => "La tua versione di PHP è obsoleta",
@@ -154,6 +162,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
"See application website" => "Visita il sito web dell'applicazione",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
+"Enable only for specific groups" => "Abilita solo per gruppi specifici",
+"All" => "Tutti",
"Administrator Documentation" => "Documentazione amministratore",
"Online Documentation" => "Documentazione in linea",
"Forum" => "Forum",
@@ -192,10 +202,19 @@ $TRANSLATIONS = array(
"Create" => "Crea",
"Admin Recovery Password" => "Password di ripristino amministrativa",
"Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+"Search Users and Groups" => "Cerca utenti e gruppi",
+"Add Group" => "Aggiungi gruppo",
+"Group" => "Gruppo",
+"Everyone" => "Chiunque",
+"Admins" => "Amministratori",
+"Default Quota" => "Quota predefinita",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
"Unlimited" => "Illimitata",
"Other" => "Altro",
"Username" => "Nome utente",
+"Quota" => "Quote",
+"Storage Location" => "Posizione di archiviazione",
+"Last Login" => "Ultimo accesso",
"change full name" => "modica nome completo",
"set new password" => "imposta una nuova password",
"Default" => "Predefinito"
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index ad31e7949e7fee4ecb76cea7c9848c7b5dc570aa..82def2ea851f6dfefac8132f681ee02bb4aca851 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Invalid value supplied for %s" => "%s に提供された無効な値",
"Saved" => "保存されました",
-"test email settings" => "eメール設定をテスト",
+"test email settings" => "メール設定をテスト",
"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
"Email sent" => "メールを送信しました",
@@ -62,11 +62,14 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
"Delete encryption keys permanently." => "暗号化キーを永久に削除する。",
"Restore encryption keys." => "暗号化キーを復元する。",
+"Unable to delete " => "削除できません",
+"Error creating group" => "グループの作成エラー",
"deleted" => "削除",
"undo" => "元に戻す",
"Groups" => "グループ",
"Group Admin" => "グループ管理者",
"Delete" => "削除",
+"never" => "無し",
"add group" => "グループを追加",
"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
"Error creating user" => "ユーザー作成エラー",
@@ -122,7 +125,7 @@ $TRANSLATIONS = array(
"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
-"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
+"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
"Security" => "セキュリティ",
"Enforce HTTPS" => "常にHTTPSを使用する",
"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
@@ -130,13 +133,14 @@ $TRANSLATIONS = array(
"Email Server" => "メールサーバー",
"This is used for sending out notifications." => "これは通知の送信に使われます。",
"From address" => "アドレスから",
+"mail" => "メール",
"Authentication required" => "要求される認証",
"Server address" => "サーバーアドレス",
"Port" => "ポート",
"Credentials" => "資格情報",
"SMTP Username" => "SMTP ユーザー名",
"SMTP Password" => "SMTP パスワード",
-"Test email settings" => "メールテスト設定",
+"Test email settings" => "メール設定をテスト",
"Send email" => "メールを送信",
"Log" => "ログ",
"Log level" => "ログレベル",
@@ -151,6 +155,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
"See application website" => "アプリケーションのウェブサイトを見る",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
+"Enable only for specific groups" => "特定のグループのみ有効に",
+"All" => "すべて",
"Administrator Documentation" => "管理者ドキュメント",
"Online Documentation" => "オンラインドキュメント",
"Forum" => "フォーラム",
@@ -189,10 +195,18 @@ $TRANSLATIONS = array(
"Create" => "作成",
"Admin Recovery Password" => "管理者リカバリパスワード",
"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+"Search Users and Groups" => "ユーザーとグループを検索",
+"Add Group" => "グループを追加",
+"Group" => "グループ",
+"Admins" => "管理者",
+"Default Quota" => "デフォルトのクォータサイズ",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
"Unlimited" => "無制限",
"Other" => "その他",
"Username" => "ユーザー名",
+"Quota" => "クオータ",
+"Storage Location" => "ストレージの場所",
+"Last Login" => "最終ログイン",
"change full name" => "フルネームを変更",
"set new password" => "新しいパスワードを設定",
"Default" => "デフォルト"
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index abc6bbee65aa08336a82683d5e5ad64cc9ad013a..0268d6d00f036423bc4efa347ba1d21b24abde13 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Groups" => "ჯგუფები",
"Group Admin" => "ჯგუფის ადმინისტრატორი",
"Delete" => "წაშლა",
+"never" => "არასდროს",
"add group" => "ჯგუფის დამატება",
"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
"Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
@@ -72,6 +73,7 @@ $TRANSLATIONS = array(
"Select an App" => "აირჩიეთ აპლიკაცია",
"See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
+"All" => "ყველა",
"Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
"Online Documentation" => "ონლაინ დოკუმენტაცია",
"Forum" => "ფორუმი",
@@ -93,9 +95,11 @@ $TRANSLATIONS = array(
"Help translate" => "თარგმნის დახმარება",
"Login Name" => "მომხმარებლის სახელი",
"Create" => "შექმნა",
+"Default Quota" => "საწყისი ქვოტა",
"Unlimited" => "ულიმიტო",
"Other" => "სხვა",
"Username" => "მომხმარებლის სახელი",
+"Quota" => "ქვოტა",
"set new password" => "დააყენეთ ახალი პაროლი",
"Default" => "საწყისი პარამეტრები"
);
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index f6586306dd04a2a23ba16e25a557c534250a72f2..5c57f6f36b6c6f0c9598277b75f787b3f38557c0 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
"Groups" => "ក្រុ",
"Group Admin" => "ក្រុមអ្នកគ្រប់គ្រង",
"Delete" => "លុប",
+"never" => "មិនដែរ",
"add group" => "បន្ថែមក្រុម",
"A valid username must be provided" => "ត្រូវផ្ដល់ឈ្មោះអ្នកប្រើឲ្យបានត្រឹមត្រូវ",
"Error creating user" => "មានកំហុសក្នុងការបង្កើតអ្នកប្រើ",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index d9dd30bf0fd76a6b78e39dfd24d8ba27c7fb6c28..292e6d4e135743b6e31e931a369c8fc742760e64 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Groups" => "그룹",
"Group Admin" => "그룹 관리자",
"Delete" => "삭제",
+"never" => "없음",
"add group" => "그룹 추가",
"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
"Error creating user" => "사용자 생성 오류",
@@ -122,6 +123,7 @@ $TRANSLATIONS = array(
"Documentation:" => "문서",
"See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>",
+"All" => "모두",
"Administrator Documentation" => "관리자 문서",
"Online Documentation" => "온라인 문서",
"Forum" => "포럼",
@@ -156,10 +158,12 @@ $TRANSLATIONS = array(
"Create" => "만들기",
"Admin Recovery Password" => "관리자 복구 암호",
"Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
+"Default Quota" => "기본 할당량",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
"Unlimited" => "무제한",
"Other" => "기타",
"Username" => "사용자 이름",
+"Quota" => "할당량",
"change full name" => "전체 이름 변경",
"set new password" => "새 암호 설정",
"Default" => "기본값"
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index f564527c5df54f6a5d5e0b84c60c6d7bc3f4aebf..91a9b62a692b08f0882cbb1d07cc4ff5b832c067 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -22,6 +22,7 @@ $TRANSLATIONS = array(
"Groups" => "Gruppen",
"Group Admin" => "Gruppen Admin",
"Delete" => "Läschen",
+"never" => "ni",
"__language_name__" => "__language_name__",
"Login" => "Login",
"Security Warning" => "Sécherheets Warnung",
@@ -39,6 +40,7 @@ $TRANSLATIONS = array(
"Add your App" => "Setz deng App bei",
"Select an App" => "Wiel eng Applikatioun aus",
"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
+"All" => "All",
"Password" => "Passwuert",
"Unable to change your password" => "Konnt däin Passwuert net änneren",
"Current password" => "Momentan 't Passwuert",
@@ -51,7 +53,10 @@ $TRANSLATIONS = array(
"Help translate" => "Hëllef iwwersetzen",
"Login Name" => "Login",
"Create" => "Erstellen",
+"Group" => "Grupp",
+"Default Quota" => "Standard Quota",
"Other" => "Aner",
-"Username" => "Benotzernumm"
+"Username" => "Benotzernumm",
+"Quota" => "Quota"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 9cec56d3b10d43f13c19ce0bfdc5441d12c33b0f..d1c238ff1a4f659583e14c2c8ab204cc48e4bf31 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -41,6 +41,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupės",
"Group Admin" => "Grupės administratorius",
"Delete" => "Ištrinti",
+"never" => "niekada",
"add group" => "pridėti grupę",
"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
"Error creating user" => "Klaida kuriant vartotoją",
@@ -91,6 +92,7 @@ $TRANSLATIONS = array(
"Select an App" => "Pasirinkite programą",
"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"All" => "Viskas",
"Administrator Documentation" => "Administratoriaus dokumentacija",
"Online Documentation" => "Dokumentacija tinkle",
"Forum" => "Forumas",
@@ -123,9 +125,12 @@ $TRANSLATIONS = array(
"Create" => "Sukurti",
"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+"Group" => "Grupė",
+"Default Quota" => "Numatytoji kvota",
"Unlimited" => "Neribota",
"Other" => "Kita",
"Username" => "Prisijungimo vardas",
+"Quota" => "Limitas",
"change full name" => "keisti pilną vardą",
"set new password" => "nustatyti naują slaptažodį",
"Default" => "Numatytasis"
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index cf0ddb8d9eb3846542da75de995ae9e497dd46a9..e6ea1695063c97ad81b22ae97718899db32790e1 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupas",
"Group Admin" => "Grupas administrators",
"Delete" => "Dzēst",
+"never" => "nekad",
"add group" => "pievienot grupu",
"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
"Error creating user" => "Kļūda, veidojot lietotāju",
@@ -79,6 +80,7 @@ $TRANSLATIONS = array(
"Select an App" => "Izvēlies lietotni",
"See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
+"All" => "Visi",
"Administrator Documentation" => "Administratora dokumentācija",
"Online Documentation" => "Tiešsaistes dokumentācija",
"Forum" => "Forums",
@@ -104,9 +106,12 @@ $TRANSLATIONS = array(
"Create" => "Izveidot",
"Admin Recovery Password" => "Administratora atgūšanas parole",
"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
+"Group" => "Grupa",
+"Default Quota" => "Apjoms pēc noklusējuma",
"Unlimited" => "Neierobežota",
"Other" => "Cits",
"Username" => "Lietotājvārds",
+"Quota" => "Apjoms",
"set new password" => "iestatīt jaunu paroli",
"Default" => "Noklusējuma"
);
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 7bc4ecc3e028754c95537c6da2cf3f2924093d98..85077348ceb959de68e931cb77b05db4574f0fab 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
"Groups" => "Групи",
"Group Admin" => "Администратор на група",
"Delete" => "Избриши",
+"never" => "никогаш",
"add group" => "додади група",
"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
"Error creating user" => "Грешка при креирање на корисникот",
@@ -70,6 +71,7 @@ $TRANSLATIONS = array(
"Select an App" => "Избери аппликација",
"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
+"All" => "Сите",
"Administrator Documentation" => "Администраторска документација",
"Online Documentation" => "Документација на интернет",
"Forum" => "Форум",
@@ -97,9 +99,11 @@ $TRANSLATIONS = array(
"Decrypt all Files" => "Дешифрирај ги сите датотеки",
"Login Name" => "Име за најава",
"Create" => "Создај",
+"Default Quota" => "Предефинирана квота",
"Unlimited" => "Неограничено",
"Other" => "Останато",
"Username" => "Корисничко име",
+"Quota" => "Квота",
"set new password" => "постави нова лозинка",
"Default" => "Предефиниран"
);
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 1c5d11894622aeee6f7ed5039848526624ee1a13..304d4f789e7bf81499fb9fc31d51b575d9e3e748 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"deleted" => "dihapus",
"Groups" => "Kumpulan",
"Delete" => "Padam",
+"never" => "jangan",
"__language_name__" => "_nama_bahasa_",
"Login" => "Log masuk",
"Security Warning" => "Amaran keselamatan",
@@ -35,7 +36,9 @@ $TRANSLATIONS = array(
"Help translate" => "Bantu terjemah",
"Login Name" => "Log masuk",
"Create" => "Buat",
+"Default Quota" => "Kuota Lalai",
"Other" => "Lain",
-"Username" => "Nama pengguna"
+"Username" => "Nama pengguna",
+"Quota" => "Kuota"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 3d01928e38352c27a507670a0b7c644f23250600..bc1c48681b5c8cc6a8c48c80361af8e1256b787c 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupper",
"Group Admin" => "Gruppeadministrator",
"Delete" => "Slett",
+"never" => "aldri",
"add group" => "legg til gruppe",
"A valid username must be provided" => "Oppgi et gyldig brukernavn",
"Error creating user" => "Feil ved oppretting av bruker",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
"See application website" => "Vis applikasjonens nettsted",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
+"All" => "Alle",
"Administrator Documentation" => "Administratordokumentasjon",
"Online Documentation" => "Online dokumentasjon",
"Forum" => "Forum",
@@ -194,10 +196,13 @@ $TRANSLATIONS = array(
"Create" => "Opprett",
"Admin Recovery Password" => "Administrativt gjenopprettingspassord",
"Enter the recovery password in order to recover the users files during password change" => "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
+"Group" => "Gruppe",
+"Default Quota" => "Standard Kvote",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
"Unlimited" => "Ubegrenset",
"Other" => "Annet",
"Username" => "Brukernavn",
+"Quota" => "Kvote",
"change full name" => "endre fullt navn",
"set new password" => "sett nytt passord",
"Default" => "Standard"
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 4255462fd19ca980a5b0418e734fed12c7f3a163..e8a12a290e95b9870ff4507f97e6480f232076a3 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Groepen",
"Group Admin" => "Groep beheerder",
"Delete" => "Verwijder",
+"never" => "geen",
"add group" => "toevoegen groep",
"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
"Error creating user" => "Fout bij aanmaken gebruiker",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
"See application website" => "Zie website van de applicatie",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
+"All" => "Alle",
"Administrator Documentation" => "Beheerdersdocumentatie",
"Online Documentation" => "Online documentatie",
"Forum" => "Forum",
@@ -192,10 +194,13 @@ $TRANSLATIONS = array(
"Create" => "Aanmaken",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
"Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
+"Group" => "Groep",
+"Default Quota" => "Standaard limiet",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
"Unlimited" => "Ongelimiteerd",
"Other" => "Anders",
"Username" => "Gebruikersnaam",
+"Quota" => "Limieten",
"change full name" => "wijzigen volledige naam",
"set new password" => "Instellen nieuw wachtwoord",
"Default" => "Standaard"
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index a85b62d840737b5ee3c4d7a99ec7459c95f6460f..9c4617ab3cf20988e7f1fe13f70f666244971476 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -41,6 +41,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupper",
"Group Admin" => "Gruppestyrar",
"Delete" => "Slett",
+"never" => "aldri",
"add group" => "legg til gruppe",
"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
"Error creating user" => "Feil ved oppretting av brukar",
@@ -85,6 +86,7 @@ $TRANSLATIONS = array(
"Select an App" => "Vel eit program",
"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
+"All" => "Alle",
"Administrator Documentation" => "Administratordokumentasjon",
"Online Documentation" => "Dokumentasjon på nett",
"Forum" => "Forum",
@@ -116,9 +118,11 @@ $TRANSLATIONS = array(
"Create" => "Lag",
"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
+"Group" => "Gruppe",
"Unlimited" => "Ubegrensa",
"Other" => "Anna",
"Username" => "Brukarnamn",
+"Quota" => "Kvote",
"set new password" => "lag nytt passord",
"Default" => "Standard"
);
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index f6eab80bcb5e354d82de2b4aa1cb14639b242a62..153f3898592c2117304fa11398fe61f07e2ca2ef 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
"Groups" => "Grops",
"Group Admin" => "Grop Admin",
"Delete" => "Escafa",
+"never" => "jamai",
"__language_name__" => "__language_name__",
"Login" => "Login",
"Security Warning" => "Avertiment de securitat",
@@ -46,7 +47,9 @@ $TRANSLATIONS = array(
"Help translate" => "Ajuda a la revirada",
"Login Name" => "Login",
"Create" => "Crea",
+"Default Quota" => "Quota per defaut",
"Other" => "Autres",
-"Username" => "Non d'usancièr"
+"Username" => "Non d'usancièr",
+"Quota" => "Quota"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 19a84b71453bd8d328674c2cd0d093174aab2522..f8aa53069638fb5aad73edd600c1c4a7fbee831b 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupy",
"Group Admin" => "Administrator grupy",
"Delete" => "Usuń",
+"never" => "nigdy",
"add group" => "dodaj grupę",
"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
"Error creating user" => "Błąd podczas tworzenia użytkownika",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
"See application website" => "Zobacz na stronie aplikacji",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
+"All" => "Wszystkie",
"Administrator Documentation" => "Dokumentacja administratora",
"Online Documentation" => "Dokumentacja online",
"Forum" => "Forum",
@@ -194,10 +196,13 @@ $TRANSLATIONS = array(
"Create" => "Utwórz",
"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
"Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+"Group" => "Grupa",
+"Default Quota" => "Domyślny udział",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
"Unlimited" => "Bez limitu",
"Other" => "Inne",
"Username" => "Nazwa użytkownika",
+"Quota" => "Udział",
"change full name" => "Zmień pełna nazwę",
"set new password" => "ustaw nowe hasło",
"Default" => "Domyślny"
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index bf8287b8f355a75f380e071a232f6c5096157f13..6e02937d093ab009ec4c0dbec6cdcbd9eb55f705 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrativo",
"Delete" => "Excluir",
+"never" => "nunca",
"add group" => "adicionar grupo",
"A valid username must be provided" => "Forneça um nome de usuário válido",
"Error creating user" => "Erro ao criar usuário",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
"See application website" => "Consulte o site aplicação",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"All" => "Todos",
"Administrator Documentation" => "Documentação de Administrador",
"Online Documentation" => "Documentação Online",
"Forum" => "Fórum",
@@ -194,10 +196,13 @@ $TRANSLATIONS = array(
"Create" => "Criar",
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+"Group" => "Grupo",
+"Default Quota" => "Quota Padrão",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
"Unlimited" => "Ilimitado",
"Other" => "Outro",
"Username" => "Nome de Usuário",
+"Quota" => "Cota",
"change full name" => "alterar nome completo",
"set new password" => "definir nova senha",
"Default" => "Padrão"
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 79d75a3753fe5357a7f06b3026d327a157b0cdb7..9febec0171efa1817d620d491451b3672a985a91 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrador",
"Delete" => "Eliminar",
+"never" => "nunca",
"add group" => "Adicionar grupo",
"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
"Error creating user" => "Erro a criar utilizador",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
"See application website" => "Ver site da aplicação",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"All" => "Todos",
"Administrator Documentation" => "Documentação de administrador.",
"Online Documentation" => "Documentação Online",
"Forum" => "Fórum",
@@ -192,10 +194,13 @@ $TRANSLATIONS = array(
"Create" => "Criar",
"Admin Recovery Password" => "Recuperar password de administrador",
"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+"Group" => "Grupo",
+"Default Quota" => "Quota por padrão",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
"Unlimited" => "Ilimitado",
"Other" => "Outro",
"Username" => "Nome de utilizador",
+"Quota" => "Quota",
"change full name" => "alterar nome completo",
"set new password" => "definir nova palavra-passe",
"Default" => "Padrão"
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 674162b12444b3ebbe959278b9a59180ecfe3373..631a1c45424d6618c440e6e733d3247511071f09 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupuri",
"Group Admin" => "Grupul Admin ",
"Delete" => "Șterge",
+"never" => "niciodată",
"add group" => "adăugaţi grupul",
"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
"Error creating user" => "Eroare la crearea utilizatorului",
@@ -102,6 +103,7 @@ $TRANSLATIONS = array(
"Select an App" => "Selectează o aplicație",
"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
+"All" => "Toate ",
"Administrator Documentation" => "Documentație administrator",
"Online Documentation" => "Documentație online",
"Forum" => "Forum",
@@ -133,9 +135,12 @@ $TRANSLATIONS = array(
"Create" => "Crează",
"Admin Recovery Password" => "Parolă de recuperare a Administratorului",
"Enter the recovery password in order to recover the users files during password change" => "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
+"Group" => "Grup",
+"Default Quota" => "Cotă implicită",
"Unlimited" => "Nelimitată",
"Other" => "Altele",
"Username" => "Nume utilizator",
+"Quota" => "Cotă",
"change full name" => "schimbă numele complet",
"set new password" => "setează parolă nouă",
"Default" => "Implicită"
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index fab366236463e4aea19e9cde8221a5ed8c56534f..5d7518b9c84240dc7ea3e946107e82e7196c7c2f 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -62,6 +62,7 @@ $TRANSLATIONS = array(
"Groups" => "Группы",
"Group Admin" => "Администратор группы",
"Delete" => "Удалить",
+"never" => "никогда",
"add group" => "добавить группу",
"A valid username must be provided" => "Укажите правильное имя пользователя",
"Error creating user" => "Ошибка создания пользователя",
@@ -136,6 +137,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
"See application website" => "См. сайт приложений",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"All" => "Все",
"Administrator Documentation" => "Документация администратора",
"Online Documentation" => "Online документация",
"Forum" => "Форум",
@@ -170,10 +172,13 @@ $TRANSLATIONS = array(
"Create" => "Создать",
"Admin Recovery Password" => "Восстановление пароля администратора",
"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+"Group" => "Группа",
+"Default Quota" => "Квота по умолчанию",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
"Unlimited" => "Неограниченно",
"Other" => "Другое",
"Username" => "Имя пользователя",
+"Quota" => "Квота",
"change full name" => "изменить полное имя",
"set new password" => "установить новый пароль",
"Default" => "По умолчанию"
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index f9d912d180d0e0d20bd553f59afaf0210159b9be..fe36bd21ba8ce38b889635b7b2c18b232a694b0f 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
"Groups" => "කණ්ඩායම්",
"Group Admin" => "කාණ්ඩ පරිපාලක",
"Delete" => "මකා දමන්න",
+"never" => "කවදාවත්",
"None" => "කිසිවක් නැත",
"Login" => "ප්රවිශ්ටය",
"Security Warning" => "ආරක්ෂක නිවේදනයක්",
@@ -51,7 +52,9 @@ $TRANSLATIONS = array(
"Help translate" => "පරිවර්ථන සහය",
"Login Name" => "ප්රවිශ්ටය",
"Create" => "තනන්න",
+"Default Quota" => "සාමාන්ය සලාකය",
"Other" => "වෙනත්",
-"Username" => "පරිශීලක නම"
+"Username" => "පරිශීලක නම",
+"Quota" => "සලාකය"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
index ab3a1bf58352cd6e4aa21af40a67b5def54dfaf0..4a9a13d6d84bbf845cde4417cffc2df28298a2dd 100644
--- a/settings/l10n/sk.php
+++ b/settings/l10n/sk.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Delete" => "Odstrániť",
+"never" => "nikdy",
"Cancel" => "Zrušiť",
"Other" => "Ostatné"
);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index a4c7a01115ad09cd72a2ce62ea295533fd90cc68..30742f30a87a609b33614d7d940e5168f5c39992 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
"Groups" => "Skupiny",
"Group Admin" => "Správca skupiny",
"Delete" => "Zmazať",
+"never" => "nikdy",
"add group" => "pridať skupinu",
"A valid username must be provided" => "Musíte zadať platné používateľské meno",
"Error creating user" => "Chyba pri vytváraní používateľa",
@@ -140,6 +141,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
"See application website" => "Pozrite si webstránku aplikácie",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
+"All" => "Všetky",
"Administrator Documentation" => "Príručka administrátora",
"Online Documentation" => "Online príručka",
"Forum" => "Fórum",
@@ -174,10 +176,13 @@ $TRANSLATIONS = array(
"Create" => "Vytvoriť",
"Admin Recovery Password" => "Obnovenie hesla administrátora",
"Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+"Group" => "Skupina",
+"Default Quota" => "Predvolená kvóta",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB\" alebo \"12 GB\")",
"Unlimited" => "Nelimitované",
"Other" => "Iné",
"Username" => "Používateľské meno",
+"Quota" => "Kvóta",
"change full name" => "zmeniť meno a priezvisko",
"set new password" => "nastaviť nové heslo",
"Default" => "Predvolené"
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 0f18d4ed103231515102ecea5d14c79ab5294e21..d8748d4cbd7c4bc43d4acd1c06367abed75609c4 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -60,6 +60,7 @@ $TRANSLATIONS = array(
"Groups" => "Skupine",
"Group Admin" => "Skrbnik skupine",
"Delete" => "Izbriši",
+"never" => "nikoli",
"add group" => "dodaj skupino",
"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
"Error creating user" => "Napaka ustvarjanja uporabnika",
@@ -137,6 +138,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
"See application website" => "Oglejte si spletno stran programa",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
+"All" => "Vsi",
"Administrator Documentation" => "Skrbniška dokumentacija",
"Online Documentation" => "Spletna dokumentacija",
"Forum" => "Forum",
@@ -171,10 +173,13 @@ $TRANSLATIONS = array(
"Create" => "Ustvari",
"Admin Recovery Password" => "Obnovitev skrbniškega gesla",
"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+"Group" => "Skupina",
+"Default Quota" => "Privzeta količinska omejitev",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
"Unlimited" => "Neomejeno",
"Other" => "Drugo",
"Username" => "Uporabniško ime",
+"Quota" => "Količinska omejitev",
"change full name" => "Spremeni polno ime",
"set new password" => "nastavi novo geslo",
"Default" => "Privzeto"
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index fb57d4fbe01a7fdd0392905566dc71173780174b..752fb7df1169a2422e07eed86f8f395c7e433da9 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupet",
"Group Admin" => "Grupi Admin",
"Delete" => "Fshi",
+"never" => "asnjëherë",
"add group" => "shto grup",
"A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi",
"Error creating user" => "Gabim gjatë krijimit të përdoruesit",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 4a96fc5b0d8b08ad7189b20c2595582934431fc3..ea9292b242774a50924c20b03d14b03a30c96ca0 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Groups" => "Групе",
"Group Admin" => "Управник групе",
"Delete" => "Обриши",
+"never" => "никада",
"add group" => "додај групу",
"A valid username must be provided" => "Морате унети исправно корисничко име",
"Error creating user" => "Грешка при прављењу корисника",
@@ -91,9 +92,12 @@ $TRANSLATIONS = array(
"Help translate" => " Помозите у превођењу",
"Login Name" => "Корисничко име",
"Create" => "Направи",
+"Group" => "Група",
+"Default Quota" => "Подразумевано ограничење",
"Unlimited" => "Неограничено",
"Other" => "Друго",
"Username" => "Корисничко име",
+"Quota" => "Ограничење",
"set new password" => "постави нову лозинку",
"Default" => "Подразумевано"
);
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 2ca3f37e1098c5d6bb441e559d8761936f6b8545..3e26ecdc423f775779cf5b7d3c5cc489b108e073 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
"Cancel" => "Otkaži",
"Language" => "Jezik",
"Create" => "Napravi",
+"Group" => "Grupa",
"Other" => "Drugo",
"Username" => "Korisničko ime"
);
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 58b70a4fca33baedec44c318cc13c820b7c58bde..d6f449866203b34d6ad08fd5a0938c511e22bc68 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Groups" => "Grupper",
"Group Admin" => "Gruppadministratör",
"Delete" => "Radera",
+"never" => "aldrig",
"add group" => "lägg till grupp",
"A valid username must be provided" => "Ett giltigt användarnamn måste anges",
"Error creating user" => "Fel vid skapande av användare",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
"See application website" => "Se applikationens webbplats",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
+"All" => "Alla",
"Administrator Documentation" => "Administratörsdokumentation",
"Online Documentation" => "Onlinedokumentation",
"Forum" => "Forum",
@@ -192,10 +194,13 @@ $TRANSLATIONS = array(
"Create" => "Skapa",
"Admin Recovery Password" => "Admin återställningslösenord",
"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the users files during password change",
+"Group" => "Grupp",
+"Default Quota" => "Förvald datakvot",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
"Unlimited" => "Obegränsad",
"Other" => "Annat",
"Username" => "Användarnamn",
+"Quota" => "Kvot",
"change full name" => "ändra hela namnet",
"set new password" => "ange nytt lösenord",
"Default" => "Förvald"
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 1ce8e5b41d5f40b8e61ac4f003b1a84a8acd7f3b..48fafcdfdf1054fa1e70b05f529730f425738575 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Groups" => "குழுக்கள்",
"Group Admin" => "குழு நிர்வாகி",
"Delete" => "நீக்குக",
+"never" => "ஒருபோதும்",
"__language_name__" => "_மொழி_பெயர்_",
"None" => "ஒன்றுமில்லை",
"Login" => "புகுபதிகை",
@@ -36,6 +37,7 @@ $TRANSLATIONS = array(
"Select an App" => "செயலி ஒன்றை தெரிவுசெய்க",
"See application page at apps.owncloud.com" => "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
+"All" => "எல்லாம்",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
"Password" => "கடவுச்சொல்",
"Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
@@ -50,7 +52,9 @@ $TRANSLATIONS = array(
"Help translate" => "மொழிபெயர்க்க உதவி",
"Login Name" => "புகுபதிகை",
"Create" => "உருவாக்குக",
+"Default Quota" => "பொது இருப்பு பங்கு",
"Other" => "மற்றவை",
-"Username" => "பயனாளர் பெயர்"
+"Username" => "பயனாளர் பெயர்",
+"Quota" => "பங்கு"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index b34b74db14acf16678359333b0d066b9ac388045..527235919c98c7d7fa39b324adc6984ba3ffacd1 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Groups" => "กลุ่ม",
"Group Admin" => "ผู้ดูแลกลุ่ม",
"Delete" => "ลบ",
+"never" => "ไม่ต้องเลย",
"__language_name__" => "ภาษาไทย",
"None" => "ไม่มี",
"Login" => "เข้าสู่ระบบ",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"Select an App" => "เลือก App",
"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
+"All" => "ทั้งหมด",
"Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
"Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
"Forum" => "กระดานสนทนา",
@@ -81,9 +83,11 @@ $TRANSLATIONS = array(
"Help translate" => "ช่วยกันแปล",
"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
"Create" => "สร้าง",
+"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
"Unlimited" => "ไม่จำกัดจำนวน",
"Other" => "อื่นๆ",
"Username" => "ชื่อผู้ใช้งาน",
+"Quota" => "พื้นที่",
"set new password" => "ตั้งค่ารหัสผ่านใหม่",
"Default" => "ค่าเริ่มต้น"
);
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 03f925df5dea97da4ecc163ff5a4386665c1f9f5..27b1f280d03cd3c76b35b7fb27c7a719da066ccc 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -62,11 +62,15 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
+"Unable to delete " => "Silinemeyen: ",
+"Error creating group" => "Grup oluşturulurken hata",
+"A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
"deleted" => "silinen:",
"undo" => "geri al",
"Groups" => "Gruplar",
"Group Admin" => "Grup Yöneticisi",
"Delete" => "Sil",
+"never" => "asla",
"add group" => "grup ekle",
"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
"Error creating user" => "Kullanıcı oluşturulurken hata",
@@ -92,6 +96,8 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
+"Database Performance Info" => "Veritabanı Başarım Bilgisi",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"Your PHP version is outdated" => "PHP sürümünüz eski",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
"See application website" => "Uygulama web sitesine bakın",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>",
+"Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
+"All" => "Tümü",
"Administrator Documentation" => "Yönetici Belgelendirmesi",
"Online Documentation" => "Çevrimiçi Belgelendirme",
"Forum" => "Forum",
@@ -194,10 +202,19 @@ $TRANSLATIONS = array(
"Create" => "Oluştur",
"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+"Search Users and Groups" => "Kullanıcı ve Grupları Ara",
+"Add Group" => "Grup Ekle",
+"Group" => "Grup",
+"Everyone" => "Herkes",
+"Admins" => "Yöneticiler",
+"Default Quota" => "Varsayılan Kota",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
"Unlimited" => "Sınırsız",
"Other" => "Diğer",
"Username" => "Kullanıcı Adı",
+"Quota" => "Kota",
+"Storage Location" => "Depolama Konumu",
+"Last Login" => "Son Giriş",
"change full name" => "tam adı değiştir",
"set new password" => "yeni parola belirle",
"Default" => "Öntanımlı"
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index 9fdfa57fd57db1f68ad8599a8ae6e87b762e037f..1e0169efa81eee5e410fa08bd2a8f166eb2ed7ba 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"Groups" => "گۇرۇپپا",
"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
"Delete" => "ئۆچۈر",
+"never" => "ھەرگىز",
"add group" => "گۇرۇپپا قوش",
"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
@@ -53,6 +54,7 @@ $TRANSLATIONS = array(
"Add your App" => "ئەپىڭىزنى قوشۇڭ",
"More Apps" => "تېخىمۇ كۆپ ئەپلەر",
"Select an App" => "بىر ئەپ تاللاڭ",
+"All" => "ھەممىسى",
"Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
"Online Documentation" => "توردىكى قوللانما",
"Forum" => "مۇنبەر",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 657ceb5187fcf32711444c1465713cf241e9cab9..4997dadb4bbdfaeef1c6de4a525e54ad5420df03 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"Groups" => "Групи",
"Group Admin" => "Адміністратор групи",
"Delete" => "Видалити",
+"never" => "ніколи",
"add group" => "додати групу",
"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
"Error creating user" => "Помилка при створенні користувача",
@@ -76,6 +77,7 @@ $TRANSLATIONS = array(
"Select an App" => "Вибрати додаток",
"See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"All" => "Всі",
"Administrator Documentation" => "Документація Адміністратора",
"Online Documentation" => "Он-Лайн Документація",
"Forum" => "Форум",
@@ -97,9 +99,11 @@ $TRANSLATIONS = array(
"Help translate" => "Допомогти з перекладом",
"Login Name" => "Ім'я Логіну",
"Create" => "Створити",
+"Default Quota" => "Квота за замовчуванням",
"Unlimited" => "Необмежено",
"Other" => "Інше",
"Username" => "Ім'я користувача",
+"Quota" => "Квота",
"set new password" => "встановити новий пароль",
"Default" => "За замовчуванням"
);
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 23ac984eec5335fd80ecc63d5c520485c2b0a1f6..c2fca2200ca80bbd7e724ae769371cb6bc00ee34 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -33,6 +33,7 @@ $TRANSLATIONS = array(
"Groups" => "Nhóm",
"Group Admin" => "Nhóm quản trị",
"Delete" => "Xóa",
+"never" => "không thay đổi",
"__language_name__" => "__Ngôn ngữ___",
"None" => "Không gì cả",
"Login" => "Đăng nhập",
@@ -62,6 +63,7 @@ $TRANSLATIONS = array(
"Select an App" => "Chọn một ứng dụng",
"See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi <span class=\"author\"></span>",
+"All" => "Tất cả",
"Administrator Documentation" => "Tài liệu quản trị",
"Online Documentation" => "Tài liệu trực tuyến",
"Forum" => "Diễn đàn",
@@ -87,9 +89,12 @@ $TRANSLATIONS = array(
"Help translate" => "Hỗ trợ dịch thuật",
"Login Name" => "Tên đăng nhập",
"Create" => "Tạo",
+"Group" => "N",
+"Default Quota" => "Hạn ngạch mặt định",
"Unlimited" => "Không giới hạn",
"Other" => "Khác",
"Username" => "Tên đăng nhập",
+"Quota" => "Hạn ngạch",
"change full name" => "Đổi họ và t",
"set new password" => "đặt mật khẩu mới",
"Default" => "Mặc định"
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 7404798db3ec210d2b57b0bcc155da9512ca5976..8bf9edf94a483d477cf9f668e698f42d201e90b0 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
"Groups" => "组",
"Group Admin" => "组管理员",
"Delete" => "删除",
+"never" => "从不",
"add group" => "添加组",
"A valid username must be provided" => "必须提供合法的用户名",
"Error creating user" => "创建用户出错",
@@ -144,6 +145,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
"See application website" => "参见应用程序网站",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
+"All" => "全部",
"Administrator Documentation" => "管理员文档",
"Online Documentation" => "在线文档",
"Forum" => "论坛",
@@ -179,10 +181,13 @@ $TRANSLATIONS = array(
"Create" => "创建",
"Admin Recovery Password" => "管理恢复密码",
"Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
+"Group" => "分组",
+"Default Quota" => "默认配额",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
"Unlimited" => "无限",
"Other" => "其它",
"Username" => "用户名",
+"Quota" => "配额",
"change full name" => "更改全名",
"set new password" => "设置新密码",
"Default" => "默认"
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 40e3207ab192ed37360445359282ef7e1d4b7d86..e68498e3d7078070880330735fb8c58083bddf8a 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
"Groups" => "群組",
"Group Admin" => "群組管理員",
"Delete" => "刪除",
+"never" => "永不",
"add group" => "新增群組",
"A valid username must be provided" => "必須提供一個有效的用戶名",
"Error creating user" => "建立用戶時出現錯誤",
@@ -140,6 +141,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
"See application website" => "檢視應用程式網站",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
+"All" => "所有",
"Administrator Documentation" => "管理者說明文件",
"Online Documentation" => "線上說明文件",
"Forum" => "論壇",
@@ -175,10 +177,12 @@ $TRANSLATIONS = array(
"Create" => "建立",
"Admin Recovery Password" => "管理者復原密碼",
"Enter the recovery password in order to recover the users files during password change" => "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+"Default Quota" => "預設容量限制",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
"Unlimited" => "無限制",
"Other" => "其他",
"Username" => "使用者名稱",
+"Quota" => "容量限制",
"change full name" => "變更全名",
"set new password" => "設定新密碼",
"Default" => "預設"