summaryrefslogtreecommitdiffstats
path: root/l10n/mk
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/mk')
-rw-r--r--l10n/mk/core.po95
-rw-r--r--l10n/mk/files.po84
-rw-r--r--l10n/mk/files_encryption.po144
-rw-r--r--l10n/mk/files_external.po4
-rw-r--r--l10n/mk/files_sharing.po8
-rw-r--r--l10n/mk/files_trashbin.po22
-rw-r--r--l10n/mk/files_versions.po4
-rw-r--r--l10n/mk/lib.po70
-rw-r--r--l10n/mk/settings.po112
-rw-r--r--l10n/mk/user_ldap.po220
-rw-r--r--l10n/mk/user_webdavauth.po10
11 files changed, 505 insertions, 268 deletions
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cca6e22f555..f1c5ef23f8d 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.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-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
#: ajax/share.php:97
#, php-format
-msgid "User %s shared a file with you"
-msgstr "Корисникот %s сподели датотека со Вас"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Корисникот %s сподели папка со Вас"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -212,26 +193,30 @@ msgstr "минатата година"
msgid "years ago"
msgstr "пред години"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Во ред"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Избери"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Избери"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:164
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:172
msgid "No"
msgstr "Не"
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr "Во ред"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -388,7 +373,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
msgid "ownCloud password reset"
msgstr "ресетирање на лозинка за ownCloud"
@@ -416,7 +401,19 @@ msgstr "Ќе добиете врска по е-пошта за да може д
msgid "Username"
msgstr "Корисничко име"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files seems to be encrypted. If you didn't have enabled the recovery "
+"key there will be no way to get your data back once the password was "
+"resetted. If you are not sure what to do, please contact your administrator "
+"first before continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
msgid "Request reset"
msgstr "Побарајте ресетирање"
@@ -464,6 +461,21 @@ msgstr "Забранет пристап"
msgid "Cloud not found"
msgstr "Облакот не е најден"
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "веб сервиси под Ваша контрола"
+
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
msgstr "Уреди категории"
@@ -556,16 +568,12 @@ msgstr "Сервер со база"
msgid "Finish setup"
msgstr "Заврши го подесувањето"
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "веб сервиси под Ваша контрола"
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
msgid "Log out"
msgstr "Одјава"
@@ -599,6 +607,13 @@ msgstr "Најава"
msgid "Alternative Logins"
msgstr ""
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "претходно"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ee5a7fa3ff5..757b342b856 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 23:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Ниту еден фајл не се вчита. Непозната грешка"
@@ -86,7 +82,7 @@ msgstr "Сподели"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
msgid "Delete"
msgstr "Избриши"
@@ -94,43 +90,43 @@ msgstr "Избриши"
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "{new_name} already exists"
msgstr "{new_name} веќе постои"
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "replace"
msgstr "замени"
-#: js/filelist.js:252
+#: js/filelist.js:259
msgid "suggest name"
msgstr "предложи име"
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "replaced {new_name} with {old_name}"
msgstr "заменета {new_name} со {old_name}"
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "undo"
msgstr "врати"
-#: js/filelist.js:324
+#: js/filelist.js:331
msgid "perform delete operation"
msgstr ""
-#: js/filelist.js:406
+#: js/filelist.js:413
msgid "1 file uploading"
msgstr "1 датотека се подига"
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
msgid "files uploading"
msgstr ""
@@ -156,69 +152,77 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:226
+#: js/files.js:231
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:259
+#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-#: js/files.js:272
+#: js/files.js:277
msgid "Not enough space available"
msgstr ""
-#: js/files.js:312
+#: js/files.js:317
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:408
+#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/files.js:481
+#: js/files.js:486
msgid "URL cannot be empty."
msgstr "Адресата неможе да биде празна."
-#: js/files.js:486
+#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
msgid "Error"
msgstr "Грешка"
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
msgid "Name"
msgstr "Име"
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
msgid "Size"
msgstr "Големина"
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
msgid "Modified"
msgstr "Променето"
-#: js/files.js:893
+#: js/files.js:898
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:895
+#: js/files.js:900
msgid "{count} folders"
msgstr "{count} папки"
-#: js/files.js:903
+#: js/files.js:908
msgid "1 file"
msgstr "1 датотека"
-#: js/files.js:905
+#: js/files.js:910
msgid "{count} files"
msgstr "{count} датотеки"
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
msgstr "Подигни"
@@ -279,37 +283,37 @@ msgstr ""
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:76
+#: templates/index.php:75
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
msgid "Unshare"
msgstr "Не споделувај"
-#: templates/index.php:108
+#: templates/index.php:107
msgid "Upload too large"
msgstr "Фајлот кој се вчитува е преголем"
-#: templates/index.php:110
+#: templates/index.php:109
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
-#: templates/index.php:115
+#: templates/index.php:114
msgid "Files are being scanned, please wait."
msgstr "Се скенираат датотеки, ве молам почекајте."
-#: templates/index.php:118
+#: templates/index.php:117
msgid "Current scanning"
msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 42d168af09c..567f8e4727f 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,144 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Maybe your password was changed from outside."
+" You can update your private key password in your personal settings to "
+"regain access to your files"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Снимам..."
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:10
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ништо"
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index c1d7e75e2ec..8daed12b604 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 23:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 34a139dd733..004608cfb52 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 23:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Преземи"
#: templates/public.php:40
msgid "No preview available for"
msgstr "Нема достапно преглед за"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "веб сервиси под Ваша контрола"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 53216a98dea..0bbfd45849e 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 23:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Грешка"
@@ -39,31 +39,31 @@ msgstr "Грешка"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} папки"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 датотека"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} датотеки"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index a25f7e9a24e..0f476264494 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index e64e413995b..e2e0a84ebf6 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.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-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:349
+#: app.php:359
msgid "Help"
msgstr "Помош"
-#: app.php:362
+#: app.php:372
msgid "Personal"
msgstr "Лично"
-#: app.php:373
+#: app.php:383
msgid "Settings"
msgstr "Подесувања"
-#: app.php:385
+#: app.php:395
msgid "Users"
msgstr "Корисници"
-#: app.php:398
+#: app.php:408
msgid "Apps"
msgstr "Аппликации"
-#: app.php:406
+#: app.php:416
msgid "Admin"
msgstr "Админ"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Преземање во ZIP е исклучено"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Датотеките треба да се симнат една по една."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Назад кон датотеки"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Избраните датотеки се преголеми за да се генерира zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:126 setup.php:332 setup.php:377
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:127 setup.php:235
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:152
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:234
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:305
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:306
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:311
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:312
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:469 setup.php:536
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:595 setup.php:627
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:647
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:870
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:871
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 7e664ae61db..9ae06683bdb 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/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-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Неисправна електронска пошта"
msgid "Unable to delete group"
msgstr "Неможе да избришам група"
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
msgid "Unable to delete user"
msgstr "Неможам да избришам корисник"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Снимам..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "врати"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Администратор на група"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:164
msgid "Delete"
msgstr "Избриши"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Повеќе"
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:116
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:119
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
-#: templates/apps.php:11
+#: templates/apps.php:13
msgid "Add your App"
msgstr "Додадете ја Вашата апликација"
-#: templates/apps.php:12
+#: templates/apps.php:28
msgid "More Apps"
msgstr "Повеќе аппликации"
-#: templates/apps.php:28
+#: templates/apps.php:33
msgid "Select an App"
msgstr "Избери аппликација"
-#: templates/apps.php:34
+#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
msgstr "Види ја страницата со апликации на apps.owncloud.com"
-#: templates/apps.php:36
+#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
-#: templates/apps.php:38
+#: templates/apps.php:43
msgid "Update"
msgstr "Ажурирај"
@@ -386,76 +386,76 @@ msgstr ""
msgid "Commercial Support"
msgstr "Комерцијална подршка"
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
msgid "Get the apps to sync your files"
msgstr ""
-#: templates/personal.php:26
+#: templates/personal.php:20
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
msgid "Password"
msgstr "Лозинка"
-#: templates/personal.php:38
+#: templates/personal.php:41
msgid "Your password was changed"
msgstr "Вашата лозинка беше променета."
-#: templates/personal.php:39
+#: templates/personal.php:42
msgid "Unable to change your password"
msgstr "Вашата лозинка неможе да се смени"
-#: templates/personal.php:40
+#: templates/personal.php:43
msgid "Current password"
msgstr "Моментална лозинка"
-#: templates/personal.php:42
+#: templates/personal.php:45
msgid "New password"
msgstr "Нова лозинка"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:59 templates/users.php:85
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:74
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:70
+#: templates/personal.php:76
msgid "Your email address"
msgstr "Вашата адреса за е-пошта"
-#: templates/personal.php:71
+#: templates/personal.php:77
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
msgid "Language"
msgstr "Јазик"
-#: templates/personal.php:89
+#: templates/personal.php:99
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:94
+#: templates/personal.php:105
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:107
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Користете ја оваа адреса да "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:84
msgid "Login Name"
msgstr ""
@@ -463,30 +463,40 @@ msgstr ""
msgid "Create"
msgstr "Создај"
-#: templates/users.php:33
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:48 templates/users.php:142
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:66 templates/users.php:157
msgid "Other"
msgstr "Останато"
-#: templates/users.php:82
+#: templates/users.php:91
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:102
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:106
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:137
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 92d9c35763e..f5597b108c8 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Домаќин"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Лозинка"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помош"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index f396468a5d5..4f39ddca61f 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Georgi Stanojevski <glisha@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
msgstr ""
#: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
#: templates/settings.php:7
msgid ""