summaryrefslogtreecommitdiffstats
path: root/l10n/vi/core.po
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-02-28 10:39:23 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2013-02-28 10:39:23 -0500
commitb5989c933f3c51887724d89e989a3e2af4207d6e (patch)
tree40677bfa8daa1357b1ca3a561b551a142cbe6c82 /l10n/vi/core.po
parentea83acedebbcf70b19643efe82b72fb139cf8ad2 (diff)
parent93e713d3781c5d5fc6d0dbb6c6a0a8f9c2e15b97 (diff)
downloadnextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.tar.gz
nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.zip
Merge branch 'master' into shared-folder-etags
Conflicts: apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'l10n/vi/core.po')
-rw-r--r--l10n/vi/core.po6
1 files changed, 3 insertions, 3 deletions
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index f7bf90b56f1..f8755bc4aed 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Khôi phục mật khẩu Owncloud "