summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/l10n/sl.php1
-rw-r--r--apps/files_external/l10n/cs_CZ.php1
-rw-r--r--apps/files_external/l10n/ko.php2
-rw-r--r--apps/files_external/l10n/sl.php2
-rw-r--r--apps/files_external/l10n/zh_CN.php17
-rw-r--r--l10n/cs_CZ/files_external.po6
-rw-r--r--l10n/it/files_sharing.po6
-rw-r--r--l10n/ko/files_external.po11
-rw-r--r--l10n/ko/lib.po32
-rw-r--r--l10n/pt_PT/lib.po27
-rw-r--r--l10n/sl/files.po8
-rw-r--r--l10n/sl/files_external.po10
-rw-r--r--l10n/templates/core.pot2
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_trashbin.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/private.pot2
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/zh_CN/files_external.po41
-rw-r--r--l10n/zh_CN/lib.po92
-rw-r--r--lib/l10n/ko.php10
-rw-r--r--lib/l10n/pt_PT.php7
-rw-r--r--lib/l10n/zh_CN.php42
29 files changed, 209 insertions, 130 deletions
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index b312b2db0df..90b18f632c3 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -44,6 +44,7 @@ $TRANSLATIONS = array(
"Rename" => "Preimenuj",
"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika.",
"Pending" => "V čakanju ...",
+"Error moving file." => "Napaka premikanja datoteke.",
"Error moving file" => "Napaka premikanja datoteke",
"Error" => "Napaka",
"Could not rename file" => "Ni mogoče preimenovati datoteke",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 4cfefbde052..e953e19a9dd 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
"Password" => "Heslo",
"Root" => "Root",
"Secure ftps://" => "Zabezpečené ftps://",
+"Username (required)" => "Uživatelské jméno (nutné)",
"Region (optional for OpenStack Object Storage)" => "Region (nepovinný pro OpenStack Object Storage)",
"Password (required for OpenStack Object Storage)" => "Heslo (vyžadováno pro OpenStack Object Storage)",
"Timeout of HTTP requests in seconds (optional)" => "Vypršení HTTP požadavků v sekundách (nepovinné)",
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 1df20b80725..6ae8ffdeb8f 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Location" => "장소",
+"Amazon S3" => "Amazon S3",
"URL" => "URL",
"Username" => "사용자 이름",
"Password" => "암호",
@@ -10,6 +11,7 @@ $TRANSLATIONS = array(
"Grant access" => "접근 권한 부여",
"Please provide a valid Dropbox app key and secret." => "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
"Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
+"Saved" => "저장됨",
"External Storage" => "외부 저장소",
"Folder name" => "폴더 이름",
"External storage" => "외부 저장소",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 04fa28127a5..235ba23eb10 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Local" => "Krajevno",
"Location" => "Mesto",
+"Amazon S3" => "Amazon S3",
+"Key" => "Ključ",
"URL" => "Naslov URL",
"Username" => "Uporabniško ime",
"Password" => "Geslo",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index a61331de365..241bc29e661 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,26 +1,43 @@
<?php
$TRANSLATIONS = array(
+"Local" => "本地",
"Location" => "地点",
+"Amazon S3" => "Amazon S3",
+"Access Key" => "访问密钥",
+"Hostname (optional)" => "域名 (可选)",
+"Port (optional)" => "端口 (可选)",
+"Region (optional)" => "区域 (optional)",
+"Enable SSL" => "启用 SSL",
"URL" => "URL",
"Username" => "用户名",
"Password" => "密码",
+"Root" => "根路径",
+"Secure ftps://" => "安全 ftps://",
"Share" => "共享",
+"SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信息",
+"Secure https://" => "安全 https://",
"Access granted" => "权限已授予。",
"Error configuring Dropbox storage" => "配置Dropbox存储时出错",
"Grant access" => "授权",
"Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
"Error configuring Google Drive storage" => "配置Google Drive存储时出错",
+"Saved" => "已保存",
+"<b>Note:</b> " => "<b>注意:</b>",
+" and " => "和",
"External Storage" => "外部存储",
"Folder name" => "目录名称",
"External storage" => "外部存储",
"Configuration" => "配置",
"Options" => "选项",
+"Available for" => "可用于",
"Add storage" => "添加存储",
+"No user or group" => "无用户或组",
"All Users" => "所有用户",
"Groups" => "组",
"Users" => "用户",
"Delete" => "删除",
"Enable User External Storage" => "启用用户外部存储",
+"Allow users to mount the following external storage" => "允许用户挂载以下外部存储",
"SSL root certificates" => "SSL根证书",
"Import Root Certificate" => "导入根证书"
);
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index fc11c63eb11..ca8bddaf9dc 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-02 01:55-0400\n"
-"PO-Revision-Date: 2014-05-01 06:10+0000\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 07:41+0000\n"
"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -122,7 +122,7 @@ msgstr ""
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "Uživatelské jméno (nutné)"
#: appinfo/app.php:95
msgid "Bucket (required)"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index b2fe87daf24..c9db889bbd7 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/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-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 06:54+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"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 322b2495a03..525648f5c2d 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -4,13 +4,14 @@
#
# Translators:
# Shinjo Park <kde@peremen.name>, 2013
+# 책읽는달팽 <bjh13579@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-05 05:43+0000\n"
+"Last-Translator: 책읽는달팽 <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "장소"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
@@ -196,7 +197,7 @@ msgstr "Google 드라이브 저장소 설정 오류"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "저장됨"
#: lib/config.php:598
msgid "<b>Note:</b> "
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 135c38d7ca8..ab3674ddd18 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,14 +7,14 @@
# chohy <chohy@yahoo.com>, 2013
# chohy <chohy@yahoo.com>, 2013
# Park Shinjo <peremen@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# 책읽는달팽 <bjh13579@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-05 05:43+0000\n"
+"Last-Translator: 책읽는달팽 <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:713
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:714
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -173,7 +173,7 @@ msgstr "토큰이 만료되었습니다. 페이지를 새로 고치십시오."
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "알려지지 않은 사용자"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -215,7 +215,7 @@ msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다"
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -243,20 +243,20 @@ msgstr "잘못된 명령: \"%s\""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다"
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "MySQL/MariaDB에서 이 사용자 제거하기"
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "MySQL/MariaDB에서 이 사용자 제거하기"
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -283,13 +283,13 @@ msgstr "관리자의 사용자 이름을 설정합니다."
msgid "Set an admin password."
msgstr "관리자의 암호를 설정합니다."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
@@ -456,7 +456,7 @@ msgstr "년 전"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "사용자 명에는 다음과 같은 문자만 사용이 가능합니다: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -468,4 +468,4 @@ msgstr "올바른 암호를 입력해야 함"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "이 사용자명은 현재 사용중입니다"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 24a89798f6c..57cf04189f6 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -5,14 +5,15 @@
# Translators:
# Helder Meneses <helder.meneses@gmail.com>, 2013
# jmruas <jmruas@gmail.com>, 2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
# PapiMigas Migas <papimigas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 15:15+0000\n"
+"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\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"
@@ -20,11 +21,11 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:713
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:714
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -213,7 +214,7 @@ msgstr "Precisa de introduzir uma conta existente ou de administrador"
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do MySQL/Maria DB inválida"
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -241,20 +242,20 @@ msgstr "O comando gerador de erro foi: \"%s\""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe."
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL/MariaDB"
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O utilizador '%s'@'%%' do MySQL/MariaDB já existe"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL/MariaDB"
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -281,13 +282,13 @@ msgstr "Definir um nome de utilizador de administrador"
msgid "Set an admin password."
msgstr "Definiar uma password de administrador"
-#: private/setup.php:202
+#: private/setup.php:164
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 não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
@@ -296,7 +297,7 @@ msgstr "Por favor verifique <a href='%s'>installation guides</a>."
#: private/share/mailnotifications.php:118
#, php-format
msgid "%s shared »%s« with you"
-msgstr "%s partilhado »%s« contigo"
+msgstr "%s partilhado »%s« consigo"
#: private/share/share.php:498
#, php-format
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 72dde571817..f4d73ef4636 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 18:39+0000\n"
+"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -215,7 +215,7 @@ msgstr "V čakanju ..."
#: js/filelist.js:916
msgid "Error moving file."
-msgstr ""
+msgstr "Napaka premikanja datoteke."
#: js/filelist.js:924
msgid "Error moving file"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 65eaae27b52..77eef9bd750 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 18:40+0000\n"
+"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "Mesto"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
-msgstr ""
+msgstr "Ključ"
#: appinfo/app.php:42
msgid "Secret"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a7ac67af8c3..169ae4b7800 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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.pot b/l10n/templates/files.pot
index c87a061fb6a..b9cc6fd8727 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 81af3a99201..54d4edfeedf 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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_external.pot b/l10n/templates/files_external.pot
index 811983b5e86..2aa7ed17ee9 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 f4e4921e222..8163df2bf59 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 6811a64f8da..567f4963224 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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_versions.pot b/l10n/templates/files_versions.pot
index c41166af959..1084bbfb0f5 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 cc0511ebf76..14423c83f00 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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/private.pot b/l10n/templates/private.pot
index 4f8f553b414..d208a9b312a 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 691b7c46720..8bbfa6c61de 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 579072005cd..e94e6bc32ce 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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 686a2c231b6..154edc8adb4 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-05-04 01:55-0400\n"
+"POT-Creation-Date: 2014-05-05 01:55-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/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 6a793252413..137e173cc99 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xuetian Weng <wengxt@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 19:56+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: appinfo/app.php:34
msgid "Local"
-msgstr ""
+msgstr "本地"
#: appinfo/app.php:36
msgid "Location"
@@ -27,7 +28,7 @@ msgstr "地点"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
@@ -47,7 +48,7 @@ msgstr ""
#: appinfo/app.php:49
msgid "Access Key"
-msgstr ""
+msgstr "访问密钥"
#: appinfo/app.php:50
msgid "Secret Key"
@@ -55,19 +56,19 @@ msgstr ""
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "域名 (可选)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "端口 (可选)"
#: appinfo/app.php:54
msgid "Region (optional)"
-msgstr ""
+msgstr "区域 (optional)"
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "启用 SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
@@ -99,11 +100,11 @@ msgstr "密码"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "根路径"
#: appinfo/app.php:77
msgid "Secure ftps://"
-msgstr ""
+msgstr "安全 ftps://"
#: appinfo/app.php:84
msgid "Client ID"
@@ -159,7 +160,7 @@ msgstr "共享"
#: appinfo/app.php:119
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS 使用 OC 登录信息"
#: appinfo/app.php:122
msgid "Username as share"
@@ -167,7 +168,7 @@ msgstr ""
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
-msgstr ""
+msgstr "安全 https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
@@ -195,15 +196,15 @@ msgstr "配置Google Drive存储时出错"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "已保存"
#: lib/config.php:598
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>注意:</b>"
#: lib/config.php:608
msgid " and "
-msgstr ""
+msgstr "和"
#: lib/config.php:630
#, php-format
@@ -248,7 +249,7 @@ msgstr "选项"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "可用于"
#: templates/settings.php:32
msgid "Add storage"
@@ -256,7 +257,7 @@ msgstr "添加存储"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "无用户或组"
#: templates/settings.php:95
msgid "All Users"
@@ -281,7 +282,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/zh_CN/lib.po b/l10n/zh_CN/lib.po
index f4119a60d4c..71f4a9a22a0 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,14 +7,14 @@
# peishi fang <fangpeishi@gmail.com>, 2014
# Martin Liu <liuzh66@gmail.com>, 2014
# modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 22:51+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"PO-Revision-Date: 2014-05-04 19:53+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:712
+#: base.php:713
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "您正在访问来自不信任域名的服务器。"
-#: base.php:713
+#: base.php:714
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -38,11 +38,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "App “%s” 无法安装,因为它和当前 ownCloud 版本不兼容。"
#: private/app.php:248
msgid "No app name specified"
-msgstr ""
+msgstr "没有指定的 App 名称"
#: private/app.php:353
msgid "Help"
@@ -101,28 +101,28 @@ msgstr "选择的文件太大,无法生成 zip 文件。"
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
-msgstr ""
+msgstr "请用较小的分块下载文件或者友好地询问您的管理员。"
#: private/installer.php:64
msgid "No source specified when installing app"
-msgstr ""
+msgstr "安装 App 时未指定来源"
#: private/installer.php:71
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "从 http 安装 App 时未指定链接"
#: private/installer.php:76
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "从本地文件安装 App 时未指定路径"
#: private/installer.php:90
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "不支持 %s 的压缩格式"
#: private/installer.php:104
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "安装 App 是打开归档失败"
#: private/installer.php:126
msgid "App does not provide an info.xml file"
@@ -130,25 +130,25 @@ msgstr "应用未提供 info.xml 文件"
#: private/installer.php:132
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "App 无法安装,因为 App 中有非法代码 "
#: private/installer.php:141
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "App 无法安装,因为和当前 ownCloud 版本不兼容"
#: private/installer.php:147
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "App 无法安装,因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签"
#: private/installer.php:160
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同"
#: private/installer.php:170
msgid "App directory already exists"
@@ -173,7 +173,7 @@ msgstr "Token 过期,请刷新页面。"
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "未知用户"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -215,7 +215,7 @@ msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB 数据库用户名和/或密码无效"
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -243,20 +243,20 @@ msgstr "冲突命令为:\"%s\""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB 用户 '%s'@'localhost' 已存在。"
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "建议从 MySQL/MariaDB 数据库中删除此用户"
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB 用户 '%s'@'%%' 已存在"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "建议从 MySQL/MariaDB 数据库中删除此用户。"
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -303,105 +303,105 @@ msgstr "%s 向您分享了 »%s«"
#: private/share/share.php:498
#, php-format
msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "共享 %s 失败,因为文件不存在。"
#: private/share/share.php:523
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "共享 %s 失败,因为用户 %s 是对象的拥有者"
#: private/share/share.php:529
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "共享 %s 失败,因为用户 %s 不存在"
#: private/share/share.php:538
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
-msgstr ""
+msgstr "共享 %s 失败,因为用户 %s 不是 %s 所属的任何组的用户"
#: private/share/share.php:551 private/share/share.php:579
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "共享 %s 失败,因为它已经共享给 %s"
#: private/share/share.php:559
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "共享 %s 失败,因为 %s 组不存在"
#: private/share/share.php:566
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
+msgstr "共享 %s 失败,因为 %s 不是 %s 组的成员"
#: private/share/share.php:629
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "共享 %s 失败,因为不允许用链接共享"
#: private/share/share.php:636
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "%s 不是 %s 的合法共享类型"
#: private/share/share.php:773
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
-msgstr ""
+msgstr "设置 %s 权限失败,因为权限超出了 %s 已有权限。"
#: private/share/share.php:834
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "设置 %s 的权限失败,因为未找到到对应项"
#: private/share/share.php:940
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "共享后端 %s 必须实现 OCP\\Share_Backend 接口"
#: private/share/share.php:947
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "未找到共享后端 %s"
#: private/share/share.php:953
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "%s 的共享后端未找到"
#: private/share/share.php:1367
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "共享 %s 失败,因为用户 %s 不是原始共享者"
#: private/share/share.php:1376
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "共享 %s 失败,因为权限超过了 %s 已有权限"
#: private/share/share.php:1391
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "共享 %s 失败,因为不允许二次共享"
#: private/share/share.php:1403
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
-msgstr ""
+msgstr "共享 %s 失败,因为 %s 使用的共享后端未找到它的来源"
#: private/share/share.php:1417
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "共享 %s 失败,因为未在文件缓存中找到文件。"
#: private/tags.php:193
#, php-format
@@ -456,7 +456,7 @@ msgstr "年前"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "用户名只允许使用以下字符:“a-z”,“A-Z”,“0-9”,和“_.@-”"
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -468,4 +468,4 @@ msgstr "必须提供合法的密码"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "用户名已被使用"
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 2c94ebdcc22..977a491ad74 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Application is not enabled" => "앱이 활성화되지 않았습니다",
"Authentication error" => "인증 오류",
"Token expired. Please reload page." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
+"Unknown user" => "알려지지 않은 사용자",
"Files" => "파일",
"Text" => "텍스트",
"Images" => "그림",
@@ -39,8 +40,13 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
"MS SQL username and/or password not valid: %s" => "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
"You need to enter either an existing account or the administrator." => "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다",
"DB Error: \"%s\"" => "DB 오류: \"%s\"",
"Offending command was: \"%s\"" => "잘못된 명령: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다",
+"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB에서 이 사용자 제거하기",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다",
+"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB에서 이 사용자 제거하기",
"Oracle connection could not be established" => "Oracle 연결을 수립할 수 없습니다.",
"Oracle username and/or password not valid" => "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
"Offending command was: \"%s\", name: %s, password: %s" => "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
@@ -61,7 +67,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n달 전 "),
"last year" => "작년",
"years ago" => "년 전",
+"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" => "올바른 암호를 입력해야 함"
+"A valid password must be provided" => "올바른 암호를 입력해야 함",
+"The username is already being used" => "이 사용자명은 현재 사용중입니다"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 8b3c003678d..ad424933331 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -40,8 +40,13 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
"You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
+"MySQL/MariaDB username and/or password not valid" => "Nome de utilizador/password do MySQL/Maria DB inválida",
"DB Error: \"%s\"" => "Erro na BD: \"%s\"",
"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe.",
+"Drop this user from MySQL/MariaDB" => "Eliminar este utilizador do MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL/MariaDB já existe",
+"Drop this user from MySQL/MariaDB." => "Eliminar este utilizador do MySQL/MariaDB",
"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
@@ -50,7 +55,7 @@ $TRANSLATIONS = array(
"Set an admin password." => "Definiar uma password 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 não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"%s shared »%s« with you" => "%s partilhado »%s« contigo",
+"%s shared »%s« with you" => "%s partilhado »%s« consigo",
"Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"",
"seconds ago" => "Minutos atrás",
"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 8fca52f3dbd..c5261a6aff0 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -1,5 +1,8 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "您正在访问来自不信任域名的服务器。",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App “%s” 无法安装,因为它和当前 ownCloud 版本不兼容。",
+"No app name specified" => "没有指定的 App 名称",
"Help" => "帮助",
"Personal" => "个人",
"Settings" => "设置",
@@ -13,12 +16,23 @@ $TRANSLATIONS = array(
"Files need to be downloaded one by one." => "需要逐一下载文件",
"Back to Files" => "回到文件",
"Selected files too large to generate zip file." => "选择的文件太大,无法生成 zip 文件。",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "请用较小的分块下载文件或者友好地询问您的管理员。",
+"No source specified when installing app" => "安装 App 时未指定来源",
+"No href specified when installing app from http" => "从 http 安装 App 时未指定链接",
+"No path specified when installing app from local file" => "从本地文件安装 App 时未指定路径",
+"Archives of type %s are not supported" => "不支持 %s 的压缩格式",
+"Failed to open archive when installing app" => "安装 App 是打开归档失败",
"App does not provide an info.xml file" => "应用未提供 info.xml 文件",
+"App can't be installed because of not allowed code in the App" => "App 无法安装,因为 App 中有非法代码 ",
+"App can't be installed because it is not compatible with this version of ownCloud" => "App 无法安装,因为和当前 ownCloud 版本不兼容",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App 无法安装,因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
"App directory already exists" => "应用程序目录已存在",
"Can't create app folder. Please fix permissions. %s" => "无法创建应用程序文件夹。请修正权限。%s",
"Application is not enabled" => "应用程序未启用",
"Authentication error" => "认证出错",
"Token expired. Please reload page." => "Token 过期,请刷新页面。",
+"Unknown user" => "未知用户",
"Files" => "文件",
"Text" => "文本",
"Images" => "图片",
@@ -27,8 +41,13 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s 您不能在数据库名称中使用英文句号。",
"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效:%s",
"You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 数据库用户名和/或密码无效",
"DB Error: \"%s\"" => "数据库错误:\"%s\"",
"Offending command was: \"%s\"" => "冲突命令为:\"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB 用户 '%s'@'localhost' 已存在。",
+"Drop this user from MySQL/MariaDB" => "建议从 MySQL/MariaDB 数据库中删除此用户",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB 用户 '%s'@'%%' 已存在",
+"Drop this user from MySQL/MariaDB." => "建议从 MySQL/MariaDB 数据库中删除此用户。",
"Oracle connection could not be established" => "不能建立甲骨文连接",
"Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
"Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为:\"%s\",名称:%s,密码:%s",
@@ -38,6 +57,25 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
"%s shared »%s« with you" => "%s 向您分享了 »%s«",
+"Sharing %s failed, because the file does not exist" => "共享 %s 失败,因为文件不存在。",
+"Sharing %s failed, because the user %s is the item owner" => "共享 %s 失败,因为用户 %s 是对象的拥有者",
+"Sharing %s failed, because the user %s does not exist" => "共享 %s 失败,因为用户 %s 不存在",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "共享 %s 失败,因为用户 %s 不是 %s 所属的任何组的用户",
+"Sharing %s failed, because this item is already shared with %s" => "共享 %s 失败,因为它已经共享给 %s",
+"Sharing %s failed, because the group %s does not exist" => "共享 %s 失败,因为 %s 组不存在",
+"Sharing %s failed, because %s is not a member of the group %s" => "共享 %s 失败,因为 %s 不是 %s 组的成员",
+"Sharing %s failed, because sharing with links is not allowed" => "共享 %s 失败,因为不允许用链接共享",
+"Share type %s is not valid for %s" => "%s 不是 %s 的合法共享类型",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "设置 %s 权限失败,因为权限超出了 %s 已有权限。",
+"Setting permissions for %s failed, because the item was not found" => "设置 %s 的权限失败,因为未找到到对应项",
+"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 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 使用的共享后端未找到它的来源",
+"Sharing %s failed, because the file could not be found in the file cache" => "共享 %s 失败,因为未在文件缓存中找到文件。",
"Could not find category \"%s\"" => "无法找到分类 \"%s\"",
"seconds ago" => "秒前",
"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
@@ -49,7 +87,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 月前"),
"last year" => "去年",
"years ago" => "年前",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "用户名只允许使用以下字符:“a-z”,“A-Z”,“0-9”,和“_.@-”",
"A valid username must be provided" => "必须提供合法的用户名",
-"A valid password must be provided" => "必须提供合法的密码"
+"A valid password must be provided" => "必须提供合法的密码",
+"The username is already being used" => "用户名已被使用"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";