diff options
author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-10 16:54:48 +0200 |
---|---|---|
committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-10 16:54:48 +0200 |
commit | cec932f29252da7d47ddcbb33003ba11252d5753 (patch) | |
tree | 3c17c41b075f37b537c5851325940ab951ce2a52 /l10n/cs_CZ/user_ldap.po | |
parent | e17c40acb79a6848af0481d434ec7643c5c9bf03 (diff) | |
parent | 72689f643b631061777149d96f6f170f7722e894 (diff) | |
download | nextcloud-server-cec932f29252da7d47ddcbb33003ba11252d5753.tar.gz nextcloud-server-cec932f29252da7d47ddcbb33003ba11252d5753.zip |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'l10n/cs_CZ/user_ldap.po')
-rw-r--r-- | l10n/cs_CZ/user_ldap.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 6617ad24829..69340de29b3 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-28 16:52+0000\n" +"POT-Creation-Date: 2013-09-07 04:40-0400\n" +"PO-Revision-Date: 2013-09-05 11:51+0000\n" "Last-Translator: pstast <petr@stastny.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" |