Merge branch 'master' into improve_app-management

Conflicts:
	settings/js/apps.js

1 files changed, 54 insertions, 34 deletions

diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index c30c709618f..a81077fb92f 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
@@ -142,31 +146,31 @@ msgstr "حذف کاربر امکان پذیر نیست"
 msgid "Groups"
 msgstr "گروه ها"
 
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "گروه مدیران"
 
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
 msgid "Delete"
 msgstr "حذف"
 
-#: js/users.js:269
+#: js/users.js:277
 msgid "add group"
 msgstr "افزودن گروه"
 
-#: js/users.js:428
+#: js/users.js:436
 msgid "A valid username must be provided"
 msgstr "نام کاربری صحیح باید وارد شود"
 
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
 msgid "Error creating user"
 msgstr "خطا در ایجاد کاربر"
 
-#: js/users.js:434
+#: js/users.js:442
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "زمانبند"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "اجرای یک وظیفه با هر بار بارگذاری صفحه"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "اشتراک گذاری"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "فعال کردن API اشتراک گذاری"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "رمزگذاری"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "نام کاربری"