diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index ef2cd8b673a7eeffc3a22eba3ccb9bb613004de4..fc07c9b911e3b2d191d321eb0a863fc77c42779d 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -7,7 +7,7 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Files" => "Dateien",
-"Unshare" => "Nicht mehr teilen",
+"Unshare" => "Nicht mehr freigeben",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
 "already exists" => "ist bereits vorhanden",
@@ -17,15 +17,15 @@
 "replaced" => "ersetzt",
 "undo" => "rückgängig machen",
 "with" => "mit",
-"unshared" => "Nicht mehr teilen",
+"unshared" => "Nicht mehr freigegeben",
 "deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat.",
-"Upload Error" => "Fehler beim Hochladen",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Upload Error" => "Fehler beim Upload",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
 "files uploading" => "Dateien werden hoch geladen",
-"Upload cancelled." => "Hochladen abgebrochen.",
+"Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
 "files scanned" => "Dateien gescannt",
@@ -58,7 +58,7 @@
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
-"From url" => "URL",
+"From url" => "Von einer URL",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index f0d016ec9c45803bc7526add7fe3a810d1e0bb3f..7aa246f9644bc4961a8b0c87124443ee822388b3 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -23,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
 "Upload Error" => "アップロードエラー",
 "Pending" => "保留",
+"1 file uploading" => "ファイルを1つアップロード中",
+"files uploading" => "ファイルをアップロード中",
 "Upload cancelled." => "アップロードはキャンセルされました。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
 "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
@@ -35,6 +37,16 @@
 "folders" => "フォルダ",
 "file" => "ファイル",
 "files" => "ファイル",
+"seconds ago" => "秒前",
+"minute ago" => "分前",
+"minutes ago" => "分前",
+"today" => "今日",
+"yesterday" => "昨日",
+"days ago" => "日前",
+"last month" => "一月前",
+"months ago" => "月前",
+"last year" => "一年前",
+"years ago" => "年前",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
 "max. possible: " => "最大容量: ",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 60c40f6d485e35f3f64389351595d9b9e6dbd25f..f2ea43ae81edc65bf791b4babfea40f034b43120 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -23,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
 "Upload Error" => "上传错误",
 "Pending" => "操作等待中",
+"1 file uploading" => "1个文件上传中",
+"files uploading" => "文件上传中",
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
 "Invalid name, '/' is not allowed." => "非法的名称,不允许使用‘/’。",
@@ -35,6 +37,16 @@
 "folders" => "文件夹",
 "file" => "文件",
 "files" => "文件",
+"seconds ago" => "几秒前",
+"minute ago" => "1分钟前",
+"minutes ago" => "分钟前",
+"today" => "今天",
+"yesterday" => "昨天",
+"days ago" => "%d 天前",
+"last month" => "上月",
+"months ago" => "月前",
+"last year" => "上年",
+"years ago" => "几年前",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能: ",
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
new file mode 100644
index 0000000000000000000000000000000000000000..64e7af3e0cdc1bd4f8301ff4334c7c45b9713486
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密码",
+"Submit" => "提交",
+"%s shared the folder %s with you" => "%s与您共享了%s文件夹",
+"%s shared the file %s with you" => "%s与您共享了%s文件",
+"Download" => "下载",
+"No preview available for" => "没有预览",
+"web services under your control" => "您控制的web服务"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index d252700df16113310511680acbf941f7db047809..fddb68599121ae6ad3cc5a6ef169d5933aa638d2 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -22,7 +22,7 @@
 "Ok" => "OK",
 "No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
+"Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
 "Shared with you and the group %s by %s" => "%s hat dies für dich und die Gruppe %s freigegeben.",
@@ -44,16 +44,16 @@
 "update" => "aktualisieren",
 "delete" => "löschen",
 "share" => "teilen",
-"Password protected" => "Passwort geschützt",
+"Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
-"Request reset" => "Anfrage zurückgesetzt",
+"Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
@@ -68,10 +68,10 @@
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Advanced" => "Erweitert",
+"Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
-"will be used" => "wird genutzt",
+"will be used" => "wird verwendet",
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
@@ -83,7 +83,7 @@
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"You are logged out." => "Sie wurden abgemeldet.",
+"You are logged out." => "Du wurdest abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter"
 );
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index e563c09cf15787a506acd1aad5840fe2cf2e6747..bd442ef41161f5fde487132c63824badcec32c75 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -45,6 +45,7 @@
 "delete" => "削除",
 "share" => "共有",
 "Password protected" => "パスワード保護",
+"Error unsetting expiration date" => "有効期限の未設定エラー",
 "Error setting expiration date" => "有効期限の設定でエラー発生",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index b84519a5c0624b41d4efa152717149c23729e59f..47bda01ab54f655dbe8312c5a5035da774de730e 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -15,13 +15,38 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"Choose" => "选择(&C)...",
 "Cancel" => "取消",
 "No" => "否",
 "Yes" => "是",
 "Ok" => "好",
 "No categories selected for deletion." => "没有选择要删除的类别",
 "Error" => "错误",
+"Error while sharing" => "共享时出错",
+"Error while unsharing" => "取消共享时出错",
+"Error while changing permissions" => "修改权限时出错",
+"Shared with you and the group %s by %s" => "与你及%s组共享,共享人: %s",
+"Shared with you by %s" => "共享人: %s",
+"Share with" => "共享",
+"Share with link" => "共享链接",
+"Password protect" => "密码保护",
 "Password" => "密码",
+"Set expiration date" => "设置过期日期",
+"Expiration date" => "过期日期",
+"Share via email: %s" => "发电子邮件分享: %s",
+"No people found" => "未找到此人",
+"Resharing is not allowed" => "不允许二次共享",
+"Shared in %s with %s" => "在%s中与%s共享",
+"Unshare" => "取消共享",
+"can edit" => "可以修改",
+"access control" => "访问控制",
+"create" => "创建",
+"update" => "更新",
+"delete" => "删除",
+"share" => "共享",
+"Password protected" => "密码已受保护",
+"Error unsetting expiration date" => "取消设置过期日期时出错",
+"Error setting expiration date" => "设置过期日期时出错",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码:{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 7e0a3635c550dfe40675efb67d020594c7c2495c..9305a60d07c06357e5663dff26015edfc51dd7b1 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 11:39+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 22:12+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
@@ -125,7 +125,7 @@ msgstr "Fehler"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr "Fehler beim Teilen"
+msgstr "Fehler beim Freigeben"
 
 #: js/share.js:114
 msgid "Error while unsharing"
@@ -217,7 +217,7 @@ msgstr "teilen"
 
 #: js/share.js:317 js/share.js:476
 msgid "Password protected"
-msgstr "Passwort geschützt"
+msgstr "Durch ein Passwort geschützt"
 
 #: js/share.js:489
 msgid "Error unsetting expiration date"
@@ -237,7 +237,7 @@ msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {lin
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen."
+msgstr "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -254,7 +254,7 @@ msgstr "Benutzername"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr "Anfrage zurückgesetzt"
+msgstr "Beantrage Zurücksetzung"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -314,7 +314,7 @@ msgstr "<strong>Administrator-Konto</strong> anlegen"
 
 #: templates/installation.php:36
 msgid "Advanced"
-msgstr "Erweitert"
+msgstr "Fortgeschritten"
 
 #: templates/installation.php:38
 msgid "Data folder"
@@ -327,7 +327,7 @@ msgstr "Datenbank einrichten"
 #: templates/installation.php:50 templates/installation.php:61
 #: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
-msgstr "wird genutzt"
+msgstr "wird verwendet"
 
 #: templates/installation.php:93
 msgid "Database user"
@@ -375,7 +375,7 @@ msgstr "Einloggen"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Sie wurden abgemeldet."
+msgstr "Du wurdest abgemeldet."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 111dacc2d9f1bf862de82b3d8937a3bd26a8bd32..e2635a4a0b11b5339ac1dddbe262c4b36fd3c47f 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2012.
+#   <blobbyjj@ymail.com>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
@@ -21,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 11:49+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 22:31+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
@@ -67,7 +68,7 @@ msgstr "Dateien"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr "Nicht mehr teilen"
+msgstr "Nicht mehr freigeben"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -107,7 +108,7 @@ msgstr "mit"
 
 #: js/filelist.js:273
 msgid "unshared"
-msgstr "Nicht mehr teilen"
+msgstr "Nicht mehr freigegeben"
 
 #: js/filelist.js:275
 msgid "deleted"
@@ -119,11 +120,11 @@ msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
 #: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat."
+msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
 
 #: js/files.js:208
 msgid "Upload Error"
-msgstr "Fehler beim Hochladen"
+msgstr "Fehler beim Upload"
 
 #: js/files.js:236 js/files.js:341 js/files.js:371
 msgid "Pending"
@@ -139,7 +140,7 @@ msgstr "Dateien werden hoch geladen"
 
 #: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
-msgstr "Hochladen abgebrochen."
+msgstr "Upload abgebrochen."
 
 #: js/files.js:424
 msgid ""
@@ -272,7 +273,7 @@ msgstr "Ordner"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr "URL"
+msgstr "Von einer URL"
 
 #: templates/index.php:20
 msgid "Upload"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index e066695345df2cb180aa1c626154bb60067e6dfb..d1d17eec25bde26c3fbf3f82d0085db07177f7de 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <blobbyjj@ymail.com>, 2012.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 #   <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 21:03+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-09-28 02:03+0200\n"
+"PO-Revision-Date: 2012-09-27 22:40+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
@@ -44,19 +45,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:280
+#: files.php:327
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:281
+#: files.php:328
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:281 files.php:306
+#: files.php:328 files.php:353
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:305
+#: files.php:352
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
@@ -70,7 +71,7 @@ msgstr "Authentifizierungs-Fehler"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
+msgstr "Token abgelaufen. Bitte lade die Seite neu."
 
 #: template.php:87
 msgid "seconds ago"
@@ -83,7 +84,7 @@ msgstr "Vor einer Minute"
 #: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr "Vor %d Minute(n)"
+msgstr "Vor %d Minuten"
 
 #: template.php:92
 msgid "today"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index b600de48c54dd1b91c6c4274a70de176ff47ca7f..ca3901fa0c96a9f1be8b67af0ba94fd31fe28741 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2011, 2012.
+#   <blobbyjj@ymail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -20,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:02+0200\n"
-"PO-Revision-Date: 2012-09-23 21:04+0000\n"
-"Last-Translator: AnybodyElse <lukas@statuscode.ch>\n"
+"POT-Creation-Date: 2012-09-28 02:03+0200\n"
+"PO-Revision-Date: 2012-09-27 22:24+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
@@ -32,12 +33,12 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Die Liste der Apps im Store konnte nicht geladen werden."
+msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
 #: ajax/togglegroups.php:15
 msgid "Authentication error"
-msgstr "Anmeldungsfehler"
+msgstr "Fehler bei der Anmeldung"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
@@ -53,11 +54,11 @@ msgstr "App konnte nicht aktiviert werden."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr "E-Mail gespeichert"
+msgstr "E-Mail Adresse gespeichert"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr "Ungültige E-Mail"
+msgstr "Ungültige E-Mail Adresse"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -120,23 +121,23 @@ msgstr "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. D
 
 #: templates/admin.php:31
 msgid "Cron"
-msgstr "Cron"
+msgstr "Cron-Jobs"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr "Führe eine Aufgabe pro geladener Seite aus."
+msgstr "Führe eine Aufgabe bei jeder geladenen Seite aus."
 
 #: templates/admin.php:43
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf."
+msgstr "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf."
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf."
+msgstr "Benutze den System-Crondienst. Bitte ruf die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf."
 
 #: templates/admin.php:56
 msgid "Sharing"
@@ -144,11 +145,11 @@ msgstr "Freigabe"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
-msgstr "Teilungs-API aktivieren"
+msgstr "Freigabe-API aktivieren"
 
 #: templates/admin.php:62
 msgid "Allow apps to use the Share API"
-msgstr "Erlaubt Nutzern, die Teilungs-API zu nutzen"
+msgstr "Erlaubt Anwendungen, die Freigabe-API zu nutzen"
 
 #: templates/admin.php:67
 msgid "Allow links"
@@ -156,7 +157,7 @@ msgstr "Links erlauben"
 
 #: templates/admin.php:68
 msgid "Allow users to share items to the public with links"
-msgstr "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
+msgstr "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen"
 
 #: templates/admin.php:73
 msgid "Allow resharing"
@@ -168,11 +169,11 @@ msgstr "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen"
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
-msgstr "Erlaube Nutzern mit jedem zu Teilen"
+msgstr "Erlaubet Nutzern mit jedem zu Teilen"
 
 #: templates/admin.php:81
 msgid "Allow users to only share with users in their groups"
-msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
+msgstr "Erlaubet Nutzern nur das Teilen in ihrer Gruppe"
 
 #: templates/admin.php:88
 msgid "Log"
@@ -194,15 +195,15 @@ msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_bla
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Fügen Sie Ihre App hinzu"
+msgstr "Füge Deine Anwendung hinzu"
 
 #: templates/apps.php:26
 msgid "Select an App"
-msgstr "Wählen Sie eine Anwendung aus"
+msgstr "Wähle eine Anwendung aus"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
+msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -218,7 +219,7 @@ msgstr "Große Dateien verwalten"
 
 #: templates/help.php:11
 msgid "Ask a question"
-msgstr "Stellen Sie eine Frage"
+msgstr "Stelle eine Frage"
 
 #: templates/help.php:23
 msgid "Problems connecting to help database."
@@ -235,7 +236,7 @@ msgstr "Antwort"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>"
+msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -247,7 +248,7 @@ msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr "Ihr Passwort wurde geändert."
+msgstr "Dein Passwort wurde geändert."
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -275,11 +276,11 @@ msgstr "E-Mail"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr "Ihre E-Mail-Adresse"
+msgstr "Deine E-Mail-Adresse"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
+msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -287,7 +288,7 @@ msgstr "Sprache"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Helfen Sie bei der Übersetzung"
+msgstr "Hilf bei der Übersetzung"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 6c588ebd9e5face28ecce597f5aa52043a5d3c56..8a0aa16cedb0d57c1043f2099c43928968f0f2ed 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:19+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 00:52+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\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"
@@ -210,7 +210,7 @@ msgstr "パスワード保護"
 
 #: js/share.js:489
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "有効期限の未設定エラー"
 
 #: js/share.js:501
 msgid "Error setting expiration date"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 906b800894745e85f34180cf7d9a4b14b6c07267..786548648ce6c4db947847e2e9f077fdd954714c 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 00:51+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\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"
@@ -119,11 +119,11 @@ msgstr "保留"
 
 #: js/files.js:256
 msgid "1 file uploading"
-msgstr ""
+msgstr "ファイルを1つアップロード中"
 
 #: js/files.js:259 js/files.js:304 js/files.js:319
 msgid "files uploading"
-msgstr ""
+msgstr "ファイルをアップロード中"
 
 #: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
@@ -138,81 +138,81 @@ msgstr "ファイル転送を実行中です。今このページから移動す
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:667
+#: js/files.js:668
 msgid "files scanned"
 msgstr "ファイルをスキャンしました"
 
-#: js/files.js:675
+#: js/files.js:676
 msgid "error while scanning"
 msgstr "スキャン中のエラー"
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:749 templates/index.php:48
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:750 templates/index.php:56
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:751 templates/index.php:58
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:777
+#: js/files.js:778
 msgid "folder"
 msgstr "フォルダ"
 
-#: js/files.js:779
+#: js/files.js:780
 msgid "folders"
 msgstr "フォルダ"
 
-#: js/files.js:787
+#: js/files.js:788
 msgid "file"
 msgstr "ファイル"
 
-#: js/files.js:789
+#: js/files.js:790
 msgid "files"
 msgstr "ファイル"
 
-#: js/files.js:833
+#: js/files.js:834
 msgid "seconds ago"
-msgstr ""
+msgstr "秒前"
 
-#: js/files.js:834
+#: js/files.js:835
 msgid "minute ago"
-msgstr ""
+msgstr "分前"
 
-#: js/files.js:835
+#: js/files.js:836
 msgid "minutes ago"
-msgstr ""
+msgstr "分前"
 
-#: js/files.js:838
+#: js/files.js:839
 msgid "today"
-msgstr ""
+msgstr "今日"
 
-#: js/files.js:839
+#: js/files.js:840
 msgid "yesterday"
-msgstr ""
+msgstr "昨日"
 
-#: js/files.js:840
+#: js/files.js:841
 msgid "days ago"
-msgstr ""
+msgstr "日前"
 
-#: js/files.js:841
+#: js/files.js:842
 msgid "last month"
-msgstr ""
+msgstr "一月前"
 
-#: js/files.js:843
+#: js/files.js:844
 msgid "months ago"
-msgstr ""
+msgstr "月前"
 
-#: js/files.js:844
+#: js/files.js:845
 msgid "last year"
-msgstr ""
+msgstr "一年前"
 
-#: js/files.js:845
+#: js/files.js:846
 msgid "years ago"
-msgstr ""
+msgstr "年前"
 
 #: templates/admin.php:5
 msgid "File handling"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3dd88c79dbfb95a52a6adfef412263e3d772e1b7..861fe878993063f33ca2ce4d733f49e0a30cb924 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 c59c25fdcb33caca84c93f807b77982f6fb9f175..80c1c196e3f681bb46392312fcef5b23b06354db 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 36387a9288c75f54185b7c77e4e9bc6491166b84..00d37e9b4e7dafb12bcd556a33fe84dcb093a473 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 286aaaaaa1cbaab59715477300b46c7ceaa42724..fb569b41bf4965b05612ae9d1a9322f8cbfc3a28 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 9b14cb918229e3135d629417561e228f119a5028..7e598348e25be31abc971f23d0c1c937b8989eeb 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 c844a192b321d75d055ba315d326cbbb079d960b..0261cee06a9e6d3e98c2c92620ac94b5116d9227 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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 1b312f927cdd67c185f9d3d271f01971ea315bea..91d014d024bcd05779938e3d78a8301c572db032 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:03+0200\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 1ce4f67633e2438afe8bcba9803aa46a5ee72f29..67eb87cfcd7179b2cb385dadd413230b4198a6e4 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:03+0200\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 805cd0c4df81deb9d33600c448b7c19b99ef6764..ed8c48f3cec81cff2cd4fcf72a86423b76cea2bc 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\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/core.po b/l10n/zh_CN/core.po
index 50fafe5cc6f79dd42b47ef0b254f27f77c5ad267..e03aa1d5d4d81d1424fea73d5583f08efdc4a0bd 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -5,14 +5,15 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 # Phoenix Nemo <>, 2012.
+#   <suiy02@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:19+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 14:37+0000\n"
+"Last-Translator: waterone <suiy02@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"
@@ -86,7 +87,7 @@ msgstr "十二月"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "选择(&C)..."
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -115,37 +116,37 @@ msgstr "错误"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr ""
+msgstr "共享时出错"
 
 #: js/share.js:114
 msgid "Error while unsharing"
-msgstr ""
+msgstr "取消共享时出错"
 
 #: js/share.js:121
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "修改权限时出错"
 
 #: js/share.js:130
 #, python-format
 msgid "Shared with you and the group %s by %s"
-msgstr ""
+msgstr "与你及%s组共享,共享人: %s"
 
 #: js/share.js:132
 #, python-format
 msgid "Shared with you by %s"
-msgstr ""
+msgstr "共享人: %s"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr ""
+msgstr "共享"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "共享链接"
 
 #: js/share.js:143
 msgid "Password protect"
-msgstr ""
+msgstr "密码保护"
 
 #: js/share.js:147 templates/installation.php:30 templates/login.php:13
 msgid "Password"
@@ -153,69 +154,69 @@ msgstr "密码"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr ""
+msgstr "设置过期日期"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr ""
+msgstr "过期日期"
 
 #: js/share.js:185
 #, python-format
 msgid "Share via email: %s"
-msgstr ""
+msgstr "发电子邮件分享: %s"
 
 #: js/share.js:187
 msgid "No people found"
-msgstr ""
+msgstr "未找到此人"
 
 #: js/share.js:214
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "不允许二次共享"
 
 #: js/share.js:250
 #, python-format
 msgid "Shared in %s with %s"
-msgstr ""
+msgstr "在%s中与%s共享"
 
 #: js/share.js:271
 msgid "Unshare"
-msgstr ""
+msgstr "取消共享"
 
 #: js/share.js:279
 msgid "can edit"
-msgstr ""
+msgstr "可以修改"
 
 #: js/share.js:281
 msgid "access control"
-msgstr ""
+msgstr "访问控制"
 
 #: js/share.js:284
 msgid "create"
-msgstr ""
+msgstr "创建"
 
 #: js/share.js:287
 msgid "update"
-msgstr ""
+msgstr "更新"
 
 #: js/share.js:290
 msgid "delete"
-msgstr ""
+msgstr "删除"
 
 #: js/share.js:293
 msgid "share"
-msgstr ""
+msgstr "共享"
 
 #: js/share.js:317 js/share.js:476
 msgid "Password protected"
-msgstr ""
+msgstr "密码已受保护"
 
 #: js/share.js:489
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "取消设置过期日期时出错"
 
 #: js/share.js:501
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "设置过期日期时出错"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 4eac1099c917d928dddedff6ba9ef82b810d4736..f6d9aa43f8efa01e8730f1e5a2e4d9ccde570ee6 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,14 +5,15 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
+#   <suiy02@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 14:26+0000\n"
+"Last-Translator: waterone <suiy02@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"
@@ -120,11 +121,11 @@ msgstr "操作等待中"
 
 #: js/files.js:256
 msgid "1 file uploading"
-msgstr ""
+msgstr "1个文件上传中"
 
 #: js/files.js:259 js/files.js:304 js/files.js:319
 msgid "files uploading"
-msgstr ""
+msgstr "文件上传中"
 
 #: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
@@ -139,81 +140,81 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称,不允许使用‘/’。"
 
-#: js/files.js:667
+#: js/files.js:668
 msgid "files scanned"
 msgstr "已扫描文件"
 
-#: js/files.js:675
+#: js/files.js:676
 msgid "error while scanning"
 msgstr "扫描时出错"
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:749 templates/index.php:48
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:750 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:751 templates/index.php:58
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:777
+#: js/files.js:778
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:779
+#: js/files.js:780
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:787
+#: js/files.js:788
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:789
+#: js/files.js:790
 msgid "files"
 msgstr "文件"
 
-#: js/files.js:833
+#: js/files.js:834
 msgid "seconds ago"
-msgstr ""
+msgstr "几秒前"
 
-#: js/files.js:834
+#: js/files.js:835
 msgid "minute ago"
-msgstr ""
+msgstr "1分钟前"
 
-#: js/files.js:835
+#: js/files.js:836
 msgid "minutes ago"
-msgstr ""
+msgstr "分钟前"
 
-#: js/files.js:838
+#: js/files.js:839
 msgid "today"
-msgstr ""
+msgstr "今天"
 
-#: js/files.js:839
+#: js/files.js:840
 msgid "yesterday"
-msgstr ""
+msgstr "昨天"
 
-#: js/files.js:840
+#: js/files.js:841
 msgid "days ago"
-msgstr ""
+msgstr "%d 天前"
 
-#: js/files.js:841
+#: js/files.js:842
 msgid "last month"
-msgstr ""
+msgstr "上月"
 
-#: js/files.js:843
+#: js/files.js:844
 msgid "months ago"
-msgstr ""
+msgstr "月前"
 
-#: js/files.js:844
+#: js/files.js:845
 msgid "last year"
-msgstr ""
+msgstr "上年"
 
-#: js/files.js:845
+#: js/files.js:846
 msgid "years ago"
-msgstr ""
+msgstr "几年前"
 
 #: templates/admin.php:5
 msgid "File handling"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 0cf69de8ed6cf3c5a087b560cc5c1ffd5fc2cf41..149353d11006059e2ec890adff4b9608b6ca1fff 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <suiy02@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:02+0200\n"
+"PO-Revision-Date: 2012-09-27 14:41+0000\n"
+"Last-Translator: waterone <suiy02@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,30 +20,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "提交"
 
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s与您共享了%s文件夹"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s与您共享了%s文件"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/public.php:29
 msgid "No preview available for"
-msgstr ""
+msgstr "没有预览"
 
 #: templates/public.php:37
 msgid "web services under your control"
-msgstr ""
+msgstr "您控制的web服务"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index defda5f688f85057c594868966fff46f3482378f..a0bc33f6106429c952c8e4288a5e3ec102e0ad5a 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -6,14 +6,15 @@
 #   <appweb.cn@gmail.com>, 2012.
 # Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
+#   <suiy02@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-19 02:02+0200\n"
-"PO-Revision-Date: 2012-09-19 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-28 02:03+0200\n"
+"PO-Revision-Date: 2012-09-27 14:13+0000\n"
+"Last-Translator: waterone <suiy02@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"
@@ -32,11 +33,11 @@ msgstr "认证错误"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr "已存在组"
+msgstr "已存在该组"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr "不能添加组"
+msgstr "无法添加组"
 
 #: ajax/enableapp.php:14
 msgid "Could not enable app. "
@@ -60,11 +61,11 @@ msgstr "非法请求"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr "不能删除组"
+msgstr "无法删除组"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr "不能删除用户"
+msgstr "无法删除用户"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -73,12 +74,12 @@ msgstr "语言已修改"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "不能把用户添加到组 %s"
+msgstr "无法把用户添加到组 %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "不能从组%s中移除用户"
+msgstr "无法从组%s中移除用户"
 
 #: js/apps.js:27 js/apps.js:61
 msgid "Disable"
@@ -107,7 +108,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。"
+msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器根目录以外。"
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -226,7 +227,7 @@ msgstr "回答"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "您已使用空间: <strong>%s</strong>,总空间: <strong>%s</strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -238,7 +239,7 @@ msgstr "下载"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr ""
+msgstr "密码已修改"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -282,7 +283,7 @@ msgstr "帮助翻译"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "在文件管理器中使用这个地址来连接到您的 ownCloud"
+msgstr "您可在文件管理器中使用该地址连接到ownCloud"
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index aea631aba2847f87339ffc1ac42ca5e6c263b528..8c81be165821ab2b651e66067515b11c51865fe0 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -11,10 +11,10 @@
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
-"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
+"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
 "seconds ago" => "Vor wenigen Sekunden",
 "1 minute ago" => "Vor einer Minute",
-"%d minutes ago" => "Vor %d Minute(n)",
+"%d minutes ago" => "Vor %d Minuten",
 "today" => "Heute",
 "yesterday" => "Gestern",
 "%d days ago" => "Vor %d Tag(en)",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 9c034fc254612b242fe068d877dc156fe680a0cf..6b86a08ced555b80c4d54093f2844457be5a09bf 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Die Liste der Apps im Store konnte nicht geladen werden.",
-"Authentication error" => "Anmeldungsfehler",
+"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Authentication error" => "Fehler bei der Anmeldung",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
 "Could not enable app. " => "App konnte nicht aktiviert werden.",
-"Email saved" => "E-Mail gespeichert",
-"Invalid email" => "Ungültige E-Mail",
+"Email saved" => "E-Mail Adresse gespeichert",
+"Invalid email" => "Ungültige E-Mail Adresse",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
@@ -19,46 +19,46 @@
 "__language_name__" => "Deutsch",
 "Security Warning" => "Sicherheitshinweis",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
+"Cron" => "Cron-Jobs",
+"Execute one task with each page loaded" => "Führe eine Aufgabe bei jeder geladenen Seite aus.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutze den System-Crondienst. Bitte ruf die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
 "Sharing" => "Freigabe",
-"Enable Share API" => "Teilungs-API aktivieren",
-"Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
+"Enable Share API" => "Freigabe-API aktivieren",
+"Allow apps to use the Share API" => "Erlaubt Anwendungen, die Freigabe-API zu nutzen",
 "Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen",
+"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen",
 "Allow resharing" => "Erneutes Teilen erlauben",
 "Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu Teilen",
-"Allow users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
+"Allow users to share with anyone" => "Erlaubet Nutzern mit jedem zu Teilen",
+"Allow users to only share with users in their groups" => "Erlaubet Nutzern nur das Teilen in ihrer Gruppe",
 "Log" => "Log",
 "More" => "Mehr",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"Add your App" => "Fügen Sie Ihre App hinzu",
-"Select an App" => "Wählen Sie eine Anwendung aus",
-"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"Add your App" => "Füge Deine Anwendung hinzu",
+"Select an App" => "Wähle eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stellen Sie eine Frage",
+"Ask a question" => "Stelle eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
 "Download" => "Download",
-"Your password was changed" => "Ihr Passwort wurde geändert.",
+"Your password was changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Your email address" => "Deine E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Übersetzung",
+"Help translate" => "Hilf bei der Übersetzung",
 "use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 41f22776885cf9d573d42587370f3fd7f155f10c..31063d3a01ba235ddae5ec3040d54d46cf7590ed 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,24 +1,24 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证错误",
-"Group already exists" => "已存在组",
-"Unable to add group" => "不能添加组",
+"Group already exists" => "已存在该组",
+"Unable to add group" => "无法添加组",
 "Could not enable app. " => "无法开启App",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
-"Unable to delete group" => "不能删除组",
-"Unable to delete user" => "不能删除用户",
+"Unable to delete group" => "无法删除组",
+"Unable to delete user" => "无法删除用户",
 "Language changed" => "语言已修改",
-"Unable to add user to group %s" => "不能把用户添加到组 %s",
-"Unable to remove user from group %s" => "不能从组%s中移除用户",
+"Unable to add user to group %s" => "无法把用户添加到组 %s",
+"Unable to remove user from group %s" => "无法从组%s中移除用户",
 "Disable" => "禁用",
 "Enable" => "启用",
 "Saving..." => "正在保存",
 "__language_name__" => "简体中文",
 "Security Warning" => "安全警告",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器根目录以外。",
 "Cron" => "计划任务",
 "Execute one task with each page loaded" => "每次页面加载完成后执行任务",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
@@ -45,8 +45,10 @@
 "Problems connecting to help database." => "连接帮助数据库错误 ",
 "Go there manually." => "手动访问",
 "Answer" => "回答",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "您已使用空间: <strong>%s</strong>,总空间: <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "桌面和移动设备同步程序",
 "Download" => "下载",
+"Your password was changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
 "New password" => "新密码",
@@ -57,7 +59,7 @@
 "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
-"use this address to connect to your ownCloud in your file manager" => "在文件管理器中使用这个地址来连接到您的 ownCloud",
+"use this address to connect to your ownCloud in your file manager" => "您可在文件管理器中使用该地址连接到ownCloud",
 "Name" => "名称",
 "Password" => "密码",
 "Groups" => "组",