summaryrefslogtreecommitdiffstats
path: root/l10n/ar/settings.po
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-27 14:41:53 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-27 14:41:53 +0200
commit80433fc4c4b052d788d9a942ce9d332b0f526362 (patch)
treeb12d522f99cdec249af1fb3bd4b00d7bd14a9c87 /l10n/ar/settings.po
parent89f0c8f39d99b4c2bf0fb9dac1ad11cbe0781a3b (diff)
parent5e243b48bb51e94daa3ba32c9175945d579040c8 (diff)
downloadnextcloud-server-80433fc4c4b052d788d9a942ce9d332b0f526362.tar.gz
nextcloud-server-80433fc4c4b052d788d9a942ce9d332b0f526362.zip
Merge branch 'master' into file_encryption_util_is_error
Conflicts: apps/files_encryption/lib/util.php
Diffstat (limited to 'l10n/ar/settings.po')
-rw-r--r--l10n/ar/settings.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a4151623505..f607fe4e347 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-05-27 02:01+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"