diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
| commit | 20ddd6e1c77224d18d5be74101b80144b7187475 (patch) | |
| tree | 1320acdc30a977f9294dc0ae2f6c36667982da31 /l10n/zh_CN.GB2312/user_ldap.po | |
| parent | 64593e4b84fdd6881a43530461c50464303cc42e (diff) | |
| parent | db6080c5c682a2bbdc420399276b81311c17802c (diff) | |
| download | nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.tar.gz nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'l10n/zh_CN.GB2312/user_ldap.po')
| -rw-r--r-- | l10n/zh_CN.GB2312/user_ldap.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po index 294b4004cbd..ee59a1a2e82 100644 --- a/l10n/zh_CN.GB2312/user_ldap.po +++ b/l10n/zh_CN.GB2312/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-06-10 01:58+0200\n" -"PO-Revision-Date: 2013-06-09 23:19+0000\n" +"POT-Creation-Date: 2013-06-11 01:56+0200\n" +"PO-Revision-Date: 2013-06-10 23:19+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" |