Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/l10n
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2012-08-02 04:06:16 +0400
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2012-08-02 04:06:16 +0400
commit91e828c6ce248a0f7d7ddde9d2c33bfea7f7428f (patch)
tree5e33e8c13ae4e56e363fef41bb3e7e616c00be91 /l10n
parentf159f607deff03201fb3b35ce1d01ef532d918fe (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'l10n')
-rw-r--r--l10n/af/contacts.po313
-rw-r--r--l10n/af/core.po8
-rw-r--r--l10n/af/settings.po10
-rw-r--r--l10n/ar/contacts.po313
-rw-r--r--l10n/ar/core.po8
-rw-r--r--l10n/ar/settings.po10
-rw-r--r--l10n/ar_SA/contacts.po313
-rw-r--r--l10n/ar_SA/core.po8
-rw-r--r--l10n/ar_SA/settings.po10
-rw-r--r--l10n/bg_BG/contacts.po313
-rw-r--r--l10n/bg_BG/core.po8
-rw-r--r--l10n/bg_BG/settings.po12
-rw-r--r--l10n/ca/contacts.po319
-rw-r--r--l10n/ca/core.po8
-rw-r--r--l10n/ca/settings.po12
-rw-r--r--l10n/cs_CZ/contacts.po315
-rw-r--r--l10n/cs_CZ/core.po8
-rw-r--r--l10n/cs_CZ/settings.po10
-rw-r--r--l10n/da/contacts.po315
-rw-r--r--l10n/da/core.po8
-rw-r--r--l10n/da/settings.po10
-rw-r--r--l10n/de/contacts.po319
-rw-r--r--l10n/de/core.po8
-rw-r--r--l10n/de/settings.po12
-rw-r--r--l10n/el/contacts.po317
-rw-r--r--l10n/el/core.po8
-rw-r--r--l10n/el/settings.po12
-rw-r--r--l10n/eo/contacts.po315
-rw-r--r--l10n/eo/core.po8
-rw-r--r--l10n/eo/settings.po10
-rw-r--r--l10n/es/contacts.po315
-rw-r--r--l10n/es/core.po8
-rw-r--r--l10n/es/settings.po12
-rw-r--r--l10n/et_EE/contacts.po315
-rw-r--r--l10n/et_EE/core.po8
-rw-r--r--l10n/et_EE/settings.po10
-rw-r--r--l10n/eu/contacts.po387
-rw-r--r--l10n/eu/core.po8
-rw-r--r--l10n/eu/settings.po16
-rw-r--r--l10n/eu_ES/contacts.po313
-rw-r--r--l10n/eu_ES/core.po8
-rw-r--r--l10n/eu_ES/settings.po12
-rw-r--r--l10n/fa/contacts.po315
-rw-r--r--l10n/fa/core.po8
-rw-r--r--l10n/fa/settings.po10
-rw-r--r--l10n/fi_FI/contacts.po315
-rw-r--r--l10n/fi_FI/core.po8
-rw-r--r--l10n/fi_FI/settings.po12
-rw-r--r--l10n/fr/contacts.po317
-rw-r--r--l10n/fr/core.po8
-rw-r--r--l10n/fr/settings.po12
-rw-r--r--l10n/gl/contacts.po315
-rw-r--r--l10n/gl/core.po8
-rw-r--r--l10n/gl/settings.po10
-rw-r--r--l10n/he/contacts.po315
-rw-r--r--l10n/he/core.po8
-rw-r--r--l10n/he/settings.po10
-rw-r--r--l10n/hr/contacts.po315
-rw-r--r--l10n/hr/core.po8
-rw-r--r--l10n/hr/settings.po10
-rw-r--r--l10n/hu_HU/contacts.po315
-rw-r--r--l10n/hu_HU/core.po8
-rw-r--r--l10n/hu_HU/settings.po10
-rw-r--r--l10n/hy/contacts.po313
-rw-r--r--l10n/hy/core.po8
-rw-r--r--l10n/hy/settings.po10
-rw-r--r--l10n/ia/contacts.po315
-rw-r--r--l10n/ia/core.po8
-rw-r--r--l10n/ia/settings.po10
-rw-r--r--l10n/id/contacts.po313
-rw-r--r--l10n/id/core.po8
-rw-r--r--l10n/id/settings.po10
-rw-r--r--l10n/id_ID/contacts.po313
-rw-r--r--l10n/id_ID/core.po8
-rw-r--r--l10n/id_ID/settings.po10
-rw-r--r--l10n/it/contacts.po319
-rw-r--r--l10n/it/core.po10
-rw-r--r--l10n/it/settings.po12
-rw-r--r--l10n/ja_JP/contacts.po369
-rw-r--r--l10n/ja_JP/core.po8
-rw-r--r--l10n/ja_JP/settings.po14
-rw-r--r--l10n/ko/contacts.po315
-rw-r--r--l10n/ko/core.po8
-rw-r--r--l10n/ko/settings.po10
-rw-r--r--l10n/lb/contacts.po315
-rw-r--r--l10n/lb/core.po8
-rw-r--r--l10n/lb/settings.po10
-rw-r--r--l10n/lt_LT/contacts.po315
-rw-r--r--l10n/lt_LT/core.po8
-rw-r--r--l10n/lt_LT/settings.po10
-rw-r--r--l10n/lv/contacts.po313
-rw-r--r--l10n/lv/core.po8
-rw-r--r--l10n/lv/settings.po10
-rw-r--r--l10n/mk/contacts.po315
-rw-r--r--l10n/mk/core.po8
-rw-r--r--l10n/mk/settings.po10
-rw-r--r--l10n/ms_MY/contacts.po315
-rw-r--r--l10n/ms_MY/core.po8
-rw-r--r--l10n/ms_MY/settings.po10
-rw-r--r--l10n/nb_NO/contacts.po315
-rw-r--r--l10n/nb_NO/core.po8
-rw-r--r--l10n/nb_NO/settings.po10
-rw-r--r--l10n/nl/contacts.po315
-rw-r--r--l10n/nl/core.po8
-rw-r--r--l10n/nl/settings.po10
-rw-r--r--l10n/nn_NO/contacts.po313
-rw-r--r--l10n/nn_NO/core.po8
-rw-r--r--l10n/nn_NO/settings.po10
-rw-r--r--l10n/pl/contacts.po381
-rw-r--r--l10n/pl/core.po8
-rw-r--r--l10n/pl/settings.po16
-rw-r--r--l10n/pt_BR/contacts.po315
-rw-r--r--l10n/pt_BR/core.po8
-rw-r--r--l10n/pt_BR/settings.po10
-rw-r--r--l10n/pt_PT/contacts.po315
-rw-r--r--l10n/pt_PT/core.po8
-rw-r--r--l10n/pt_PT/settings.po10
-rw-r--r--l10n/ro/contacts.po313
-rw-r--r--l10n/ro/core.po8
-rw-r--r--l10n/ro/settings.po10
-rw-r--r--l10n/ru/contacts.po315
-rw-r--r--l10n/ru/core.po8
-rw-r--r--l10n/ru/settings.po12
-rw-r--r--l10n/sk_SK/contacts.po315
-rw-r--r--l10n/sk_SK/core.po8
-rw-r--r--l10n/sk_SK/settings.po10
-rw-r--r--l10n/sl/contacts.po315
-rw-r--r--l10n/sl/core.po8
-rw-r--r--l10n/sl/settings.po12
-rw-r--r--l10n/so/contacts.po313
-rw-r--r--l10n/so/core.po8
-rw-r--r--l10n/so/settings.po10
-rw-r--r--l10n/sr/contacts.po313
-rw-r--r--l10n/sr/core.po8
-rw-r--r--l10n/sr/settings.po10
-rw-r--r--l10n/sr@latin/contacts.po313
-rw-r--r--l10n/sr@latin/core.po8
-rw-r--r--l10n/sr@latin/settings.po10
-rw-r--r--l10n/sv/contacts.po315
-rw-r--r--l10n/sv/core.po8
-rw-r--r--l10n/sv/settings.po12
-rw-r--r--l10n/templates/bookmarks.pot2
-rw-r--r--l10n/templates/calendar.pot2
-rw-r--r--l10n/templates/contacts.pot311
-rw-r--r--l10n/templates/core.pot6
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/gallery.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/media.pot2
-rw-r--r--l10n/templates/settings.pot8
-rw-r--r--l10n/th_TH/contacts.po315
-rw-r--r--l10n/th_TH/core.po8
-rw-r--r--l10n/th_TH/settings.po10
-rw-r--r--l10n/tr/contacts.po317
-rw-r--r--l10n/tr/core.po8
-rw-r--r--l10n/tr/settings.po12
-rw-r--r--l10n/uk/contacts.po313
-rw-r--r--l10n/uk/core.po8
-rw-r--r--l10n/uk/settings.po12
-rw-r--r--l10n/vi/contacts.po313
-rw-r--r--l10n/vi/core.po8
-rw-r--r--l10n/vi/settings.po10
-rw-r--r--l10n/zh_CN/contacts.po315
-rw-r--r--l10n/zh_CN/core.po8
-rw-r--r--l10n/zh_CN/settings.po10
-rw-r--r--l10n/zh_TW/contacts.po315
-rw-r--r--l10n/zh_TW/core.po8
-rw-r--r--l10n/zh_TW/settings.po10
168 files changed, 9402 insertions, 8808 deletions
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 2333c2fb296..91dc7911760 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 527198ed85c..88fb86a58a5 100644
--- a/l10n/af/core.po
+++ b/l10n/af/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 59aa93b425a..3b7b6ab272a 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2c712f76921..88a96f503f6 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "خطء خلال توقيف كتاب العناوين."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "خطء خلال اضافة معرفه جديده."
@@ -30,7 +26,9 @@ msgstr "خطء خلال اضافة معرفه جديده."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطء خلال توقيف كتاب العناوين."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطء خلال تعديل كتاب العناوين"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "خطء خلال تعديل الصفه."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "خطء خلال تعديل كتاب العناوين"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr "المعارف"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "معرفه"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "هذا ليس دفتر عناوينك."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "لم يتم العثور على الشخص."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "عنوان"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "الهاتف"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "البريد الالكتروني"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "المؤسسة"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "الوظيفة"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "البيت"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "الهاتف المحمول"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "معلومات إضافية"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "صوت"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "الفاكس"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "الفيديو"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "الرنان"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "تاريخ الميلاد"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "كتب العناوين"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "كتاب عناوين جديد"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "وصلة CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "انزال"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "تعديل"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "حذف"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "حذف"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "مفضل"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "الهاتف"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "انزال المعرفه"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "امحي المعرفه"
@@ -799,7 +790,7 @@ msgstr "الاسم المعروض"
msgid "Active"
msgstr "فعال"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "حفظ"
@@ -807,7 +798,7 @@ msgstr "حفظ"
msgid "Submit"
msgstr "ارسال"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "الغاء"
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "انزال"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "تعديل"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "كتاب عناوين جديد"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 40dbd440690..a4cc8c065a3 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "تعديلات"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index cb1df6d2759..ec5ea404477 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "حصه"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "حذف"
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 555fd8a481f..4b0078ce6fe 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: ar_SA\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 367bc89fa57..7f31f831b3d 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index f6e11e306c6..97403dbc3c9 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index d3511531840..1e675355334 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 96d5aeb2168..5cb2d7ef8a7 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Януари"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 00bd674afae..ef69b440c90 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:43+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Квота по подразбиране"
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -212,10 +212,6 @@ msgstr ""
msgid "Quota"
msgstr "Квота"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Изтриване"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index f73ac255105..b82f58e8966 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error en (des)activar la llibreta d'adreces."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "S'ha produït un error en afegir el contacte."
@@ -31,7 +27,9 @@ msgstr "S'ha produït un error en afegir el contacte."
msgid "element name is not set."
msgstr "no s'ha establert el nom de l'element."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "no s'ha establert la id."
@@ -55,6 +53,18 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
msgid "Error adding contact property: "
msgstr "Error en afegir la propietat del contacte:"
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error en (des)activar la llibreta d'adreces."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error en actualitzar la llibreta d'adreces."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "No heu facilitat cap ID"
@@ -168,14 +178,6 @@ msgstr "Alguna cosa ha anat FUBAR."
msgid "Error updating contact property."
msgstr "Error en actualitzar la propietat del contacte."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Error en actualitzar la llibreta d'adreces."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Error en carregar contactes a l'emmagatzemament."
@@ -222,71 +224,78 @@ msgstr "No s'ha carregat cap fitxer. Error desconegut"
msgid "Contacts"
msgstr "Contactes"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Aquesta funcionalitat encara no està implementada"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "No implementada"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "No s'ha pogut obtenir una adreça vàlida."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Error"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contacte"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Nou"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Contate nou"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Aquesta propietat no pot ser buida."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "No s'han pogut serialitzar els elements."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Edita el nom"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "No s'han seleccionat fitxers per a la pujada."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Seleccioneu un tipus"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -299,129 +308,133 @@ msgstr " importat, "
msgid " failed."
msgstr " fallada."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "No s'ha trobat la llibreta d'adreces."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Aquesta no és la vostra llibreta d'adreces"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "No s'ha trobat el contacte."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adreça"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telèfon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Correu electrònic"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organització"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Feina"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Casa"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mòbil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Text"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Veu"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Missatge"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vídeo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Paginador"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Aniversari"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Negocis"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Trucada"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Clients"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Emissari"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Vacances"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Idees"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Viatge"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Aniversari"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Reunió"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Altres"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Personal"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Projectes"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Preguntes"
@@ -439,209 +452,187 @@ msgstr "Importa"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Configuració"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Llibretes d'adreces"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Tanca"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Dreceres de teclat"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Navegació"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Següent contacte de la llista"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Contacte anterior de la llista"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Expandeix/col·lapsa la llibreta d'adreces"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Següent/anterior llibreta d'adreces"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Accions"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Carrega de nou la llista de contactes"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Afegeix un contacte nou"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Afegeix una llibreta d'adreces nova"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Esborra el contacte"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura les llibretes d'adreces"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova llibreta d'adreces"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enllaç CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edita"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Elimina la foto a carregar"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Elimina la foto actual"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Edita la foto actual"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Carrega una foto nova"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Selecciona una foto de ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Edita detalls del nom"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Sobrenom"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Escriviu el sobrenom"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Adreça web"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Vés a la web"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grups"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separeu els grups amb comes"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Edita els grups"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferit"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Especifiqueu una adreça de correu electrònic correcta"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Escriviu una adreça de correu electrònic"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Envia per correu electrònic a l'adreça"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Elimina l'adreça de correu electrònic"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Escriviu el número de telèfon"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Elimina el número de telèfon"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Visualitza al mapa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Edita els detalls de l'adreça"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Afegiu notes aquí."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Afegeix un camp"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telèfon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Baixa el contacte"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Suprimeix el contacte"
@@ -800,7 +791,7 @@ msgstr "Nom a mostrar"
msgid "Active"
msgstr "Actiu"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Desa"
@@ -808,7 +799,7 @@ msgstr "Desa"
msgid "Submit"
msgstr "Envia"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancel·la"
@@ -832,15 +823,15 @@ msgstr "Nom de la nova llibreta d'adreces"
msgid "Importing contacts"
msgstr "S'estan important contactes"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "No teniu contactes a la llibreta d'adreces."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Afegeix un contacte"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configura les llibretes d'adreces"
@@ -872,6 +863,34 @@ msgstr "Adreça primària (Kontact i al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Enllaç(os) vCard només de lectura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova llibreta d'adreces"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 65b3ff15834..4d26bb008c5 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Arranjament"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Gener"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 43be7c44b6a..63756ed863b 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:08+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -203,7 +203,7 @@ msgstr "Quota per defecte"
msgid "Other"
msgstr "Altre"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "SubAdmin"
@@ -211,10 +211,6 @@ msgstr "SubAdmin"
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per a ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Suprimeix"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 2b16024e2be..c59ae23b7be 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba při (de)aktivaci adresáře."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Během přidávání kontaktu nastala chyba."
@@ -32,7 +28,9 @@ msgstr "Během přidávání kontaktu nastala chyba."
msgid "element name is not set."
msgstr "jméno elementu není nastaveno."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id neni nastaveno."
@@ -56,6 +54,18 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba při (de)aktivaci adresáře."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nelze aktualizovat adresář s prázdným jménem."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba při aktualizaci adresáře."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID nezadáno"
@@ -169,14 +179,6 @@ msgstr "Něco se pokazilo. "
msgid "Error updating contact property."
msgstr "Chyba při aktualizaci údaje kontaktu."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nelze aktualizovat adresář s prázdným jménem."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Chyba při aktualizaci adresáře."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Chyba při nahrávání kontaktů do úložiště."
@@ -223,71 +225,78 @@ msgstr "Soubor nebyl odeslán. Neznámá chyba"
msgid "Contacts"
msgstr "Kontakty"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Bohužel, tato funkce nebyla ještě implementována."
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Neimplementováno"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Nelze získat platnou adresu."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Tento parametr nemuže zůstat nevyplněn."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Prvky nelze převést.."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Upravit jméno"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Žádné soubory nebyly vybrány k nahrání."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Vybrat typ"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Výsledek: "
@@ -300,129 +309,133 @@ msgstr "importováno v pořádku,"
msgid " failed."
msgstr "neimportováno."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresář nenalezen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Toto není Váš adresář."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt nebyl nalezen."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresa"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizace"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Pracovní"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Domácí"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Text"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Hlas"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Zpráva"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Narozeniny"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "Import"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresáře"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Zavřít"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavit adresáře"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresář"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stažení"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editovat"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Odstranit"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Přetáhněte sem fotku pro její nahrání"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Smazat současnou fotku"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Upravit současnou fotku"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Nahrát novou fotku"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Vybrat fotku z ownCloudu"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Upravit podrobnosti jména"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstranit"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Přezdívka"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Zadejte přezdívku"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd. mm. yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Skupiny"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Oddělte skupiny čárkami"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Upravit skupiny"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferovaný"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Prosím zadejte platnou e-mailovou adresu"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Zadat e-mailovou adresu"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Odeslat na adresu"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Smazat e-mail"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Zadat telefoní číslo"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Smazat telefoní číslo"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Zobrazit na mapě"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Upravit podrobnosti adresy"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Zde můžete připsat poznámky."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Přidat políčko"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Poznámka"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Stáhnout kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Odstranit kontakt"
@@ -801,7 +792,7 @@ msgstr "Zobrazené jméno"
msgid "Active"
msgstr "Aktivní"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Uložit"
@@ -809,7 +800,7 @@ msgstr "Uložit"
msgid "Submit"
msgstr "Potvrdit"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Storno"
@@ -833,15 +824,15 @@ msgstr "Jméno nového adresáře"
msgid "Importing contacts"
msgstr "Importování kontaktů"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Nemáte žádné kontakty v adresáři."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Přidat kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Nastavit adresář"
@@ -873,6 +864,34 @@ msgstr "Hlavní adresa (Kontakt etc)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stažení"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editovat"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresář"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index bfc8ad14e39..ebca07a4426 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Leden"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 59288cbf813..6b10067fe4f 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Výchozí kvóta"
msgid "Other"
msgstr "Jiné"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -214,10 +214,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvóta"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Vymazat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index d6f33b75f3e..d95f9fcb44b 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fejl ved (de)aktivering af adressebogen"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
@@ -34,7 +30,9 @@ msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
msgid "element name is not set."
msgstr "Elementnavnet er ikke medsendt."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "Intet ID medsendt."
@@ -58,6 +56,18 @@ msgstr "Kan ikke tilføje overlappende element."
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fejl ved (de)aktivering af adressebogen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke opdatére adressebogen med et tomt navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fejl ved opdatering af adressebog"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Intet ID medsendt"
@@ -171,14 +181,6 @@ msgstr "Noget gik grueligt galt. "
msgid "Error updating contact property."
msgstr "Fejl ved opdatering af egenskab for kontaktperson."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan ikke opdatére adressebogen med et tomt navn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fejl ved opdatering af adressebog"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
@@ -225,71 +227,78 @@ msgstr "Ingen fil blev uploadet. Ukendt fejl."
msgid "Contacts"
msgstr "Kontaktpersoner"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Denne funktion er desværre ikke implementeret endnu"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Ikke implementeret"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Kunne ikke finde en gyldig adresse."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fejl"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontaktperson"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Dette felt må ikke være tomt."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Kunne ikke serialisere elementerne."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Rediger navn"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Der er ikke valgt nogen filer at uploade."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Dr."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Vælg type"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr " importeret "
msgid " failed."
msgstr " fejl."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressebogen blev ikke fundet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dette er ikke din adressebog."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontaktperson kunne ikke findes."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisation"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Arbejde"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Hjemme"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "SMS"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Telefonsvarer"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Besked"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Personsøger"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Fødselsdag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -444,207 +457,185 @@ msgstr "Importer"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressebøger"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Luk"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebøger"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebog"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slet"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Drop foto for at uploade"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Slet nuværende foto"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Rediger nuværende foto"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Upload nyt foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Vælg foto fra ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Rediger navnedetaljer."
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slet"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Kaldenavn"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Indtast kaldenavn"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-åååå"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupper"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Opdel gruppenavne med kommaer"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Rediger grupper"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Foretrukken"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Indtast venligst en gyldig email-adresse."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Indtast email-adresse"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Send mail til adresse"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Slet email-adresse"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Indtast telefonnummer"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Slet telefonnummer"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Vis på kort"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Rediger adresse detaljer"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Tilføj noter her."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Tilføj element"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Note"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Download kontaktperson"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Slet kontaktperson"
@@ -803,7 +794,7 @@ msgstr "Vist navn"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Gem"
@@ -811,7 +802,7 @@ msgstr "Gem"
msgid "Submit"
msgstr "Gem"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Fortryd"
@@ -835,15 +826,15 @@ msgstr "Navn på ny adressebog"
msgid "Importing contacts"
msgstr "Importerer kontaktpersoner"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Du har ingen kontaktpersoner i din adressebog."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Tilføj kontaktpeson."
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfigurer adressebøger"
@@ -875,6 +866,34 @@ msgstr "Primær adresse (Kontak m. fl.)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebog"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 324afe6129d..c2a6184506b 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januar"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index d4d081a64da..4f4826be77d 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,7 @@ msgstr "Standard kvote"
msgid "Other"
msgstr "Andet"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -215,10 +215,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvote"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Slet"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 62fdc325659..8218d777fca 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -32,10 +32,6 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Erstellen des Kontakts fehlgeschlagen"
@@ -44,7 +40,9 @@ msgstr "Erstellen des Kontakts fehlgeschlagen"
msgid "element name is not set."
msgstr "Kein Name für das Element angegeben."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID ist nicht angegeben."
@@ -68,6 +66,18 @@ msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
msgid "Error adding contact property: "
msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adressbuch aktualisieren fehlgeschlagen"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Keine ID angegeben"
@@ -181,14 +191,6 @@ msgstr "Irgendwas ist hier so richtig schief gelaufen. "
msgid "Error updating contact property."
msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adressbuch aktualisieren fehlgeschlagen"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Übertragen der Kontakte fehlgeschlagen"
@@ -235,71 +237,78 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
msgid "Contacts"
msgstr "Kontakte"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Nicht Verfügbar"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Konnte keine gültige Adresse abrufen"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Neu"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Neuer Kontakt"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Dieses Feld darf nicht Leer sein."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Konnte Elemente nicht serialisieren"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Name ändern"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Keine Datei(en) zum Hochladen ausgewählt"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Wähle Typ"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Ergebnis: "
@@ -312,129 +321,133 @@ msgstr " importiert, "
msgid " failed."
msgstr " fehlgeschlagen."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch nicht gefunden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dies ist nicht dein Adressbuch."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt konnte nicht gefunden werden."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-Mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisation"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Arbeit"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Zuhause"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Text"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Anruf"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mitteilung"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Geburtstag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Geschäftlich"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Anruf"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Kunden"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Lieferant"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Feiertage"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Ideen"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Reise"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Jubiläum"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Besprechung"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Andere"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Persönlich"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Projekte"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Fragen"
@@ -452,209 +465,187 @@ msgstr "Importieren"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressbücher"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Schließen"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Tastaturbefehle"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Navigation"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Nächster Kontakt aus der Liste"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Vorheriger Kontakt aus der Liste"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Ausklappen/Einklappen des Adressbuches"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Nächstes/Vorhergehendes Adressbuch"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Aktionen"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Kontaktliste neu laden"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Neuen Kontakt hinzufügen"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Neues Adressbuch hinzufügen"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Aktuellen Kontakt löschen"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbücher konfigurieren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neues Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Herunterladen"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Löschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Zieh' ein Foto hierher zum Hochladen"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Derzeitiges Foto löschen"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Foto ändern"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Neues Foto hochladen"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Foto aus ownCloud auswählen"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Name ändern"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Spitzname"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Spitzname angeben"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Webseite"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Webseite aufrufen"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd.mm.yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Gruppen"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Gruppen mit Komma getrennt"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Gruppen editieren"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Bevorzugt"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Bitte eine gültige E-Mail-Adresse angeben."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "E-Mail-Adresse angeben."
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "E-Mail an diese Adresse schreiben"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "E-Mail-Adresse löschen"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Telefonnummer angeben"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Telefonnummer löschen"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Auf Karte anzeigen"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Adressinformationen ändern"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Füge hier Notizen ein."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Feld hinzufügen"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Notiz"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Kontakt herunterladen"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Kontakt löschen"
@@ -813,7 +804,7 @@ msgstr "Anzeigename"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Speichern"
@@ -821,7 +812,7 @@ msgstr "Speichern"
msgid "Submit"
msgstr "Eintragen"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Abbrechen"
@@ -845,15 +836,15 @@ msgstr "Name des neuen Adressbuchs"
msgid "Importing contacts"
msgstr "Kontakte werden importiert"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Du hast keine Kontakte im Adressbuch."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Kontakt hinzufügen"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Adressbücher konfigurieren"
@@ -885,6 +876,34 @@ msgstr "primäre Adresse (für Kontact o.ä. Programme)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neues Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d2ab1e7a26e..bee17cb2809 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -45,10 +45,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januar"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 92690194d8e..7fa8d58e355 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 18:48+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -209,7 +209,7 @@ msgstr "Standard Quota"
msgid "Other"
msgstr "Andere"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "Unteradministrator"
@@ -217,10 +217,6 @@ msgstr "Unteradministrator"
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Unteradministrator für..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Löschen"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 59ca23304ea..20cd68f115c 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -23,10 +23,6 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Σφάλμα κατά την προσθήκη επαφής."
@@ -35,7 +31,9 @@ msgstr "Σφάλμα κατά την προσθήκη επαφής."
msgid "element name is not set."
msgstr "δεν ορίστηκε όνομα στοιχείου"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "δεν ορίστηκε id"
@@ -59,6 +57,18 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ
msgid "Error adding contact property: "
msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Δε δόθηκε ID"
@@ -172,14 +182,6 @@ msgstr "Κάτι χάθηκε στο άγνωστο. "
msgid "Error updating contact property."
msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Σφάλμα κατά την αποθήκευση επαφών"
@@ -226,71 +228,78 @@ msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλ
msgid "Contacts"
msgstr "Επαφές"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Δεν έχει υλοποιηθεί"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Σφάλμα"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Επαφή"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Νέο"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Νέα επαφή"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "το 'deleteProperty' καλέστηκε χωρίς without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Αλλαγή ονόματος"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Επιλογή τύπου"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Αποτέλεσμα: "
@@ -303,129 +312,133 @@ msgstr " εισάγεται,"
msgid " failed."
msgstr " απέτυχε."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Διεύθυνση"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Τηλέφωνο"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Οργανισμός"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Εργασία"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Σπίτι"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Κινητό"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Κείμενο"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Ομιλία"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Μήνυμα"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Φαξ"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Βίντεο"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Βομβητής"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Διαδίκτυο"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Γενέθλια"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Επιχείρηση"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Κάλεσε"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Πελάτες"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Προμηθευτής"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Διακοπές"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Ιδέες"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Ταξίδι"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Ιωβηλαίο"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Συνάντηση"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Άλλο"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Προσωπικό"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Έργα"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Ερωτήσεις"
@@ -445,207 +458,185 @@ msgstr "Εισαγωγή"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Βιβλία διευθύνσεων"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Κλείσιμο "
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Συντομεύσεις πλητρολογίου"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Πλοήγηση"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Επόμενη επαφή στη λίστα"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Προηγούμενη επαφή στη λίστα"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Ενέργειες"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Ανανέωσε τη λίστα επαφών"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Προσθήκη νέας επαφής"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Προσθήκη νέου βιβλίου επαφών"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Διαγραφή τρέχουσας επαφής"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Ρυθμίστε το βιβλίο διευθύνσεων "
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Νέο βιβλίο διευθύνσεων"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Σύνδεσμος CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Λήψη"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Ρίξε μια φωτογραφία για ανέβασμα"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Διαγραφή τρέχουσας φωτογραφίας"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Επεξεργασία τρέχουσας φωτογραφίας"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Ανέβασε νέα φωτογραφία"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Επέλεξε φωτογραφία από το ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Παρατσούκλι"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Εισάγετε παρατσούκλι"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Ιστότοπος"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Πήγαινε στον ιστότοπο"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Ομάδες"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Διαχώρισε τις ομάδες με κόμμα "
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Επεξεργασία ομάδων"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Προτιμώμενο"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Εισήγαγε διεύθυνση ηλεκτρονικού ταχυδρομείου"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Αποστολή σε διεύθυνση"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Διαγραφή διεύθυνση email"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Εισήγαγε αριθμό τηλεφώνου"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Διέγραψε αριθμό τηλεφώνου"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Προβολή στο χάρτη"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Πρόσθεσε τις σημειώσεις εδώ"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Προσθήκη πεδίου"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Τηλέφωνο"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Σημείωση"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Λήψη επαφής"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Διαγραφή επαφής"
@@ -804,7 +795,7 @@ msgstr "Προβαλλόμενο όνομα"
msgid "Active"
msgstr "Ενεργό"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Αποθήκευση"
@@ -812,7 +803,7 @@ msgstr "Αποθήκευση"
msgid "Submit"
msgstr "Καταχώρηση"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Ακύρωση"
@@ -836,15 +827,15 @@ msgstr "Όνομα νέου βιβλίου διευθύνσεων"
msgid "Importing contacts"
msgstr "Εισαγωγή επαφών"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Δεν έχεις επαφές στο βιβλίο διευθύνσεων"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Προσθήκη επαφής"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
@@ -876,6 +867,34 @@ msgstr "Κύρια διεύθυνση"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Λήψη"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Νέο βιβλίο διευθύνσεων"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 97808b122bb..5f3262deb67 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Ιανουάριος"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 02857c416c8..d0a70f29288 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 11:41+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +207,7 @@ msgstr "Προεπιλεγμένο όριο"
msgid "Other"
msgstr "Άλλα"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "SubAdmin"
@@ -215,10 +215,6 @@ msgstr "SubAdmin"
msgid "Quota"
msgstr "Σύνολο χώρου"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin για ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Διαγραφή"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index b040e06d2c4..b892bbe22c5 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Eraro dum (mal)aktivigo de adresaro."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Eraro okazis dum aldono de kontakto."
@@ -30,7 +26,9 @@ msgstr "Eraro okazis dum aldono de kontakto."
msgid "element name is not set."
msgstr "eronomo ne agordiĝis."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "identigilo ne agordiĝis."
@@ -54,6 +52,18 @@ msgstr "Provante aldoni duobligitan propraĵon:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Eraro dum (mal)aktivigo de adresaro."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eraro dum ĝisdatigo de adresaro."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Neniu identigilo proviziĝis."
@@ -167,14 +177,6 @@ msgstr "Io FUBAR-is."
msgid "Error updating contact property."
msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eraro dum ĝisdatigo de adresaro."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
@@ -221,71 +223,78 @@ msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
msgid "Contacts"
msgstr "Kontaktoj"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Ne disponebla"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Ne eblis ekhavi validan adreson."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Eraro"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Ĉi tiu propraĵo devas ne esti malplena."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Redakti nomon"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Neniu dosiero elektita por alŝuto."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Elektu tipon"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Rezulto: "
@@ -298,129 +307,133 @@ msgstr " enportoj, "
msgid " failed."
msgstr "malsukcesoj."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresaro ne troviĝis."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ĉi tiu ne estas via adresaro."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Ne eblis trovi la kontakton."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adreso"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefono"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Retpoŝtadreso"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizaĵo"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Laboro"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Hejmo"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Poŝtelefono"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Teksto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voĉo"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mesaĝo"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fakso"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Videaĵo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Televokilo"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Interreto"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Naskiĝotago"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr "Enporti"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresaroj"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Fermi"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Agordi adresarojn"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova adresaro"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-ligilo"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Elŝuti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redakti"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Forigi"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Demeti foton por alŝuti"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Forigi nunan foton"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Redakti nunan foton"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Alŝuti novan foton"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Elekti foton el ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Redakti detalojn de nomo"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Kromnomo"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Enigu kromnomon"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "yyyy-mm-dd"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupoj"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Disigi grupojn per komoj"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Redakti grupojn"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferata"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Bonvolu specifi validan retpoŝtadreson."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Enigi retpoŝtadreson"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Retpoŝtmesaĝo al adreso"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Forigi retpoŝþadreson"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Enigi telefonnumeron"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Forigi telefonnumeron"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Vidi en mapo"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Redakti detalojn de adreso"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Aldoni notojn ĉi tie."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Aldoni kampon"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefono"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Noto"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Elŝuti kontakton"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Forigi kontakton"
@@ -799,7 +790,7 @@ msgstr "Montronomo"
msgid "Active"
msgstr "Aktiva"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Konservi"
@@ -807,7 +798,7 @@ msgstr "Konservi"
msgid "Submit"
msgstr "Sendi"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Nuligi"
@@ -831,15 +822,15 @@ msgstr "Nomo de nova adresaro"
msgid "Importing contacts"
msgstr "Enportante kontaktojn"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Vi ne havas kontaktojn en via adresaro"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Aldoni kontakton"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Agordi adresarojn"
@@ -871,6 +862,34 @@ msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Elŝuti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redakti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova adresaro"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 88e04e3e102..8d72ea6ef56 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januaro"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 662744f0915..3435e84663d 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Defaŭlta kvoto"
msgid "Other"
msgstr "Alia"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvoto"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Forigi"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index cecb721b9aa..14340a646e6 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error al (des)activar libreta de direcciones."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Se ha producido un error al añadir el contacto."
@@ -34,7 +30,9 @@ msgstr "Se ha producido un error al añadir el contacto."
msgid "element name is not set."
msgstr "no se ha puesto ningún nombre de elemento."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "no se ha puesto ninguna ID."
@@ -58,6 +56,18 @@ msgstr "Intentando añadir una propiedad duplicada: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error al (des)activar libreta de direcciones."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No se puede actualizar una libreta de direcciones sin nombre."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error al actualizar la libreta de direcciones."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "No se ha proporcionado una ID"
@@ -171,14 +181,6 @@ msgstr "Plof. Algo ha fallado."
msgid "Error updating contact property."
msgstr "Error al actualizar una propiedad del contacto."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "No se puede actualizar una libreta de direcciones sin nombre."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Error al actualizar la libreta de direcciones."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Error al subir contactos al almacenamiento."
@@ -225,71 +227,78 @@ msgstr "Fallo no se subió el fichero"
msgid "Contacts"
msgstr "Contactos"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Perdón esta función no esta aún implementada"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "No esta implementada"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Fallo : no hay dirección valida"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fallo"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contacto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Este campo no puede estar vacío."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Fallo no podido ordenar los elementos"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Edita el Nombre"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "No hay ficheros seleccionados para subir"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Selecciona el tipo"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado :"
@@ -302,129 +311,133 @@ msgstr "Importado."
msgid " failed."
msgstr "Fallo."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Libreta de direcciones no encontrada."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Esta no es tu agenda de contactos."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "No se ha podido encontrar el contacto."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Dirección"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Teléfono"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Correo electrónico"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organización"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Trabajo"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Particular"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Móvil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voz"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mensaje"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vídeo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Localizador"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Cumpleaños"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -444,207 +457,185 @@ msgstr "Importar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Libretas de direcciones"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Cierra."
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar libretas de direcciones"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nueva libreta de direcciones"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enlace CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Borrar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Suelta una foto para subirla"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Eliminar fotografía actual"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editar fotografía actual"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Subir nueva fotografía"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Seleccionar fotografía desde ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editar los detalles del nombre"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Borrar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Alias"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Introduce un alias"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupos"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separa los grupos con comas"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editar grupos"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Por favor especifica una dirección de correo electrónico válida."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Introduce una dirección de correo electrónico"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Enviar por correo a la dirección"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Eliminar dirección de correo electrónico"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Introduce un número de teléfono"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Eliminar número de teléfono"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Ver en el mapa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editar detalles de la dirección"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Añade notas aquí."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Añadir campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Teléfono"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Descargar contacto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Eliminar contacto"
@@ -803,7 +794,7 @@ msgstr "Nombre a mostrar"
msgid "Active"
msgstr "Activo"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Guardar"
@@ -811,7 +802,7 @@ msgstr "Guardar"
msgid "Submit"
msgstr "Aceptar"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancelar"
@@ -835,15 +826,15 @@ msgstr "Nombre de la nueva agenda"
msgid "Importing contacts"
msgstr "Importando contactos"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "No hay contactos en tu agenda."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Añadir contacto"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configurar agenda"
@@ -875,6 +866,34 @@ msgstr "Dirección primaria (Kontact et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nueva libreta de direcciones"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e55ee419584..0dfd58a77a7 100644
--- a/l10n/es/core.po
+++ b/l10n/es/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Enero"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e5e6215db31..37d1b2e5344 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 04:34+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Cuota predeterminada"
msgid "Other"
msgstr "Otro"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "SubAdmin"
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
msgid "Quota"
msgstr "Cuota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin para ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Eliminar"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 41ce51e36ac..8ca1073883f 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Viga aadressiraamatu (de)aktiveerimisel."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Konktakti lisamisel tekkis viga."
@@ -30,7 +26,9 @@ msgstr "Konktakti lisamisel tekkis viga."
msgid "element name is not set."
msgstr "elemendi nime pole määratud."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID on määramata."
@@ -54,6 +52,18 @@ msgstr "Proovitakse lisada topeltomadust: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Viga aadressiraamatu (de)aktiveerimisel."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Viga aadressiraamatu uuendamisel."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID-d pole sisestatud"
@@ -167,14 +177,6 @@ msgstr "Midagi läks tõsiselt metsa."
msgid "Error updating contact property."
msgstr "Viga konktaki korralikul uuendamisel."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Viga aadressiraamatu uuendamisel."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Viga kontaktide üleslaadimisel kettale."
@@ -221,71 +223,78 @@ msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
msgid "Contacts"
msgstr "Kontaktid"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Vabandust, aga see funktsioon pole veel valmis"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Pole implementeeritud"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Kehtiva aadressi hankimine ebaõnnestus"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Viga"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "See omadus ei tohi olla tühi."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Muuda nime"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Üleslaadimiseks pole faile valitud."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Vali tüüp"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulemus: "
@@ -298,129 +307,133 @@ msgstr " imporditud, "
msgid " failed."
msgstr " ebaõnnestus."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Aadressiraamatut ei leitud"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "See pole sinu aadressiraamat."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakti ei leitud."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Aadress"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-post"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisatsioon"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Töö"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Kodu"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobiil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Hääl"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Sõnum"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Piipar"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Sünnipäev"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr "Impordi"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Aadressiraamatud"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Sule"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Seadista aadressiraamatut"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uus aadressiraamat"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lae alla"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muuda"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Kustuta"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Lohista üleslaetav foto siia"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Kustuta praegune foto"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Muuda praegust pilti"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Lae üles uus foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Vali foto ownCloudist"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Muuda nime üksikasju"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Hüüdnimi"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Sisesta hüüdnimi"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd.mm.yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupid"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Eralda grupid komadega"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Muuda gruppe"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Eelistatud"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Palun sisesta korrektne e-posti aadress."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Sisesta e-posti aadress"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Kiri aadressile"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Kustuta e-posti aadress"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Sisesta telefoninumber"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Kustuta telefoninumber"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Vaata kaardil"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Muuda aaressi infot"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Lisa märkmed siia."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Lisa väli"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Märkus"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Lae kontakt alla"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Kustuta kontakt"
@@ -799,7 +790,7 @@ msgstr "Näidatav nimi"
msgid "Active"
msgstr "Aktiivne"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Salvesta"
@@ -807,7 +798,7 @@ msgstr "Salvesta"
msgid "Submit"
msgstr "Saada"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Loobu"
@@ -831,15 +822,15 @@ msgstr "Uue aadressiraamatu nimi"
msgid "Importing contacts"
msgstr "Kontaktide importimine"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Lisa kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Seadista aadressiraamatuid"
@@ -871,6 +862,34 @@ msgstr "Peamine aadress"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lae alla"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muuda"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uus aadressiraamat"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index a98c7fc2768..8e0bb95d9f7 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Jaanuar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e9ec42e5308..56a6b7f20ab 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Vaikimisi kvoot"
msgid "Other"
msgstr "Muu"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Mahupiir"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Kustuta"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index a35dba2f955..1d8001bc54a 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Errore bat egon da kontaktua gehitzerakoan"
@@ -32,13 +28,15 @@ msgstr "Errore bat egon da kontaktua gehitzerakoan"
msgid "element name is not set."
msgstr "elementuaren izena ez da ezarri."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "IDa ez da ezarri."
#: ajax/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ezin izan da kontaktua analizatu:"
#: ajax/addproperty.php:56
msgid "Cannot add empty property."
@@ -54,7 +52,19 @@ msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
#: ajax/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore bat egon da helbide liburua eguneratzen."
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
@@ -169,14 +179,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Errorea kontaktu propietatea eguneratzean."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore bat egon da helbide liburua eguneratzen."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
@@ -223,71 +225,78 @@ msgstr "Ez da fitxategirik igo. Errore ezezaguna"
msgid "Contacts"
msgstr "Kontaktuak"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Inplementatu gabe"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Ezin izan da eposta baliagarri bat hartu."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errorea"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontaktua"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
-msgstr ""
+msgstr "Berria"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
-msgstr ""
+msgstr "Kontaktu berria"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Propietate hau ezin da hutsik egon."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Ezin izan dira elementuak serializatu."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Editatu izena"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Ez duzu igotzeko fitxategirik hautatu."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Hautatu mota"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Emaitza:"
@@ -300,131 +309,135 @@ msgstr " inportatua, "
msgid " failed."
msgstr "huts egin du."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Helbide liburua ez da aurkitu"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Hau ez da zure helbide liburua."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Ezin izan da kontaktua aurkitu."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Helbidea"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefonoa"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Eposta"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Erakundea"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Lana"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Etxea"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mugikorra"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Testua"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Ahotsa"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mezua"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax-a"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Bideoa"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Bilagailua"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Jaioteguna"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "Deia"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Bezeroak"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Oporrak"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Ideiak"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Bidaia"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Bilera"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Bestelakoa"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Pertsonala"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Proiektuak"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Galderak"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -440,209 +453,187 @@ msgstr "Inportatu"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Helbide Liburuak"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Itxi"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Teklatuaren lasterbideak"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
-msgstr ""
+msgstr "Nabigazioa"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
-msgstr ""
+msgstr "Hurrengoa kontaktua zerrendan"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
-msgstr ""
+msgstr "Aurreko kontaktua zerrendan"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Zabaldu/tolestu uneko helbide-liburua"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Hurrengo/aurreko helbide-liburua"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Ekintzak"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Gaurkotu kontaktuen zerrenda"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Gehitu kontaktu berria"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Gehitu helbide-liburu berria"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguratu Helbide Liburuak"
+msgstr "Ezabatu uneko kontaktuak"
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Helbide-liburu berria"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lotura"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Deskargatu"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editatu"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Askatu argazkia igotzeko"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Ezabatu oraingo argazkia"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editatu oraingo argazkia"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Igo argazki berria"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Hautatu argazki bat ownCloudetik"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editatu izenaren zehaztasunak"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Ezizena"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Sartu ezizena"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Web orria"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.webgunea.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Web orrira joan"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "yyyy-mm-dd"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Taldeak"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Banatu taldeak komekin"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editatu taldeak"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Hobetsia"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Mesedez sartu eposta helbide egoki bat"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Sartu eposta helbidea"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Bidali helbidera"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Ezabatu eposta helbidea"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Sartu telefono zenbakia"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Ezabatu telefono zenbakia"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Ikusi mapan"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editatu helbidearen zehaztasunak"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Gehitu oharrak hemen."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Gehitu eremua"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefonoa"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Oharra"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Deskargatu kontaktua"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Ezabatu kontaktua"
@@ -665,11 +656,11 @@ msgstr "Posta kutxa"
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "Kalearen helbidea"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Kalea eta zenbakia"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -677,7 +668,7 @@ msgstr "Hedatua"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "Etxe zenbakia eab."
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -698,7 +689,7 @@ msgstr "Posta kodea"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "Posta kodea"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -801,7 +792,7 @@ msgstr "Bistaratzeko izena"
msgid "Active"
msgstr "Aktibo"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Gorde"
@@ -809,7 +800,7 @@ msgstr "Gorde"
msgid "Submit"
msgstr "Bidali"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Ezeztatu"
@@ -833,29 +824,29 @@ msgstr "Helbide liburuaren izena"
msgid "Importing contacts"
msgstr "Kontaktuak inportatzen"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Ez duzu kontakturik zure helbide liburuan."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Gehitu kontaktua"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfiguratu helbide liburuak"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Hautatu helbide-liburuak"
#: templates/part.selectaddressbook.php:20
msgid "Enter name"
-msgstr ""
+msgstr "Sartu izena"
#: templates/part.selectaddressbook.php:22
msgid "Enter description"
-msgstr ""
+msgstr "Sartu deskribapena"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -873,6 +864,34 @@ msgstr "Helbide nagusia"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editatu"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Helbide-liburu berria"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 8fdfcdcd07b..f758d66577b 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Urtarrila"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 5b5b358bcaf..eda83576c67 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Baliogabeko eskaria"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Autentifikazio errorea"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -62,7 +62,7 @@ msgstr "Euskera"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Segurtasun abisua"
#: templates/admin.php:28
msgid "Log"
@@ -204,18 +204,14 @@ msgstr "Kuota lehentsia"
msgid "Other"
msgstr "Besteak"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
#: templates/users.php:82
msgid "Quota"
msgstr "Kuota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Ezabatu"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index ff9ad670179..7b57737f952 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 98e3012b65c..0a342ad7e02 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 6e77d37cb42..8b8dcb1934f 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index f453f6e2c61..50dc9b76f28 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
@@ -30,7 +26,9 @@ msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
msgid "element name is not set."
msgstr "نام اصلی تنظیم نشده است"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "شناسه تعیین نشده"
@@ -54,6 +52,18 @@ msgstr "امتحان کردن برای وارد کردن مشخصات تکرار
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "هیچ شناسه ای ارائه نشده"
@@ -167,14 +177,6 @@ msgstr "چند چیز به FUBAR رفتند"
msgid "Error updating contact property."
msgstr "خطا در هنگام بروزرسانی اطلاعات شخص مورد نظر"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
@@ -221,71 +223,78 @@ msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
msgid "Contacts"
msgstr "اشخاص"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "انجام نشد"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Couldn't get a valid address."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "خطا"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "اشخاص"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "نام تغییر"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "نوع را انتخاب کنید"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "نتیجه:"
@@ -298,129 +307,133 @@ msgstr "وارد شد،"
msgid " failed."
msgstr "ناموفق"
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "کتابچه نشانی ها یافت نشد"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "این کتابچه ی نشانه های شما نیست"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "اتصال ویا تماسی یافت نشد"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "نشانی"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "تلفن"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "نشانی پست الکترنیک"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "نهاد(ارگان)"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "کار"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "خانه"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "موبایل"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "متن"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "صدا"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "پیغام"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "دورنگار:"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "رسانه تصویری"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "صفحه"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "اینترنت"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "روزتولد"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr "وارد کردن"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "کتابچه ی نشانی ها"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "بستن"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "پیکر بندی کتابچه نشانی ها"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "کتابچه نشانه های جدید"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "بارگیری"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "ویرایش"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "پاک کردن"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "پاک کردن تصویر کنونی"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "ویرایش تصویر کنونی"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "بار گذاری یک تصویر جدید"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "انتخاب یک تصویر از ابر های شما"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "ویرایش نام جزئیات"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "پاک کردن"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "نام مستعار"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "یک نام مستعار وارد کنید"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "گروه ها"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "جدا کردن گروه ها به وسیله درنگ نما"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "ویرایش گروه ها"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "مقدم"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "یک پست الکترونیکی وارد کنید"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "به نشانی ارسال شد"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "پاک کردن نشانی پست الکترونیکی"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "شماره تلفن راوارد کنید"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "پاک کردن شماره تلفن"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "دیدن روی نقشه"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "ویرایش جزئیات نشانی ها"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "اینجا یادداشت ها را بیافزایید"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "اضافه کردن فیلد"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "شماره تلفن"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "یادداشت"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "دانلود مشخصات اشخاص"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "پاک کردن اطلاعات شخص مورد نظر"
@@ -799,7 +790,7 @@ msgstr "نام برای نمایش"
msgid "Active"
msgstr "فعال"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "ذخیره سازی"
@@ -807,7 +798,7 @@ msgstr "ذخیره سازی"
msgid "Submit"
msgstr "ارسال"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "انصراف"
@@ -831,15 +822,15 @@ msgstr "نام کتابچه نشانی جدید"
msgid "Importing contacts"
msgstr "وارد کردن اشخاص"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "شماهیچ شخصی در کتابچه نشانی خود ندارید"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "افزودن اطلاعات شخص مورد نظر"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "پیکربندی کتابچه ی نشانی ها"
@@ -871,6 +862,34 @@ msgstr "نشانی اولیه"
msgid "iOS/OS X"
msgstr "iOS/OS X "
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "بارگیری"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "ویرایش"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "کتابچه نشانه های جدید"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index e2c97e1c454..05c5ea57eb7 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "ژانویه"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index ab1c42e2957..6ccc6f4586b 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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "سهم پیش فرض"
msgid "Other"
msgstr "سایر"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "سهم"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "پاک کردن"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 8ec5c5cc620..0df7c2a0cdd 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Virhe yhteystietoa lisättäessä."
@@ -33,7 +29,9 @@ msgstr "Virhe yhteystietoa lisättäessä."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -57,6 +55,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Virhe päivitettäessä osoitekirjaa."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -170,14 +180,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Virhe päivitettäessä osoitekirjaa."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -224,71 +226,78 @@ msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
msgid "Contacts"
msgstr "Yhteystiedot"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Virhe"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Yhteystieto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Uusi"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Uusi yhteystieto"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Muokkaa nimeä"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Tiedostoja ei ole valittu lähetettäväksi."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulos: "
@@ -301,129 +310,133 @@ msgstr " tuotu, "
msgid " failed."
msgstr " epäonnistui."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Osoitekirjaa ei löytynyt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Tämä ei ole osoitekirjasi."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Yhteystietoa ei löytynyt."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Osoite"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Puhelin"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Sähköposti"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisaatio"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Työ"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Koti"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobiili"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Teksti"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Ääni"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Viesti"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faksi"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Hakulaite"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Syntymäpäivä"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Työ"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Muu"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Kysymykset"
@@ -443,207 +456,185 @@ msgstr "Tuo"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Osoitekirjat"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Sulje"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Toiminnot"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Päivitä yhteystietoluettelo"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Lisää uusi yhteystieto"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Lisää uusi osoitekirja"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Poista nykyinen yhteystieto"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Muokkaa osoitekirjoja"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uusi osoitekirja"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-linkki"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lataa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Poista"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Poista nykyinen valokuva"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Muokkaa nykyistä valokuvaa"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Lähetä uusi valokuva"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Valitse valokuva ownCloudista"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Muokkaa nimitietoja"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Poista"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Kutsumanimi"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Anna kutsumanimi"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Verkkosivu"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Siirry verkkosivulle"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Ryhmät"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Erota ryhmät pilkuilla"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Muokkaa ryhmiä"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Anna kelvollinen sähköpostiosoite."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Anna sähköpostiosoite"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Poista sähköpostiosoite"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Anna puhelinnumero"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Poista puhelinnumero"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Näytä kartalla"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Muokkaa osoitetietoja"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Lisää huomiot tähän."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Lisää kenttä"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Puhelin"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Huomio"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Lataa yhteystieto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Poista yhteystieto"
@@ -802,7 +793,7 @@ msgstr ""
msgid "Active"
msgstr "Aktiivinen"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Tallenna"
@@ -810,7 +801,7 @@ msgstr "Tallenna"
msgid "Submit"
msgstr "Lähetä"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Peru"
@@ -834,15 +825,15 @@ msgstr "Uuden osoitekirjan nimi"
msgid "Importing contacts"
msgstr "Tuodaan yhteystietoja"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Osoitekirjassasi ei ole yhteystietoja."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Lisää yhteystieto"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Muokkaa osoitekirjoja"
@@ -874,6 +865,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lataa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uusi osoitekirja"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 652247ff5c8..072f0ad9ca4 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr ""
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Tammikuu"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d79aad9bbd2..012ddb1408d 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 15:51+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -203,7 +203,7 @@ msgstr "Oletuskiintiö"
msgid "Other"
msgstr "Muu"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Kiintiö"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Poista"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 9d6d8f6ccd5..6fac7c43826 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Une erreur s'est produite lors de l'ajout du contact."
@@ -39,7 +35,9 @@ msgstr "Une erreur s'est produite lors de l'ajout du contact."
msgid "element name is not set."
msgstr "Le champ Nom n'est pas défini."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "L'ID n'est pas défini."
@@ -63,6 +61,18 @@ msgstr "Ajout d'une propriété en double:"
msgid "Error adding contact property: "
msgstr "Erreur pendant l'ajout de la propriété du contact :"
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erreur lors de la mise à jour du carnet d'adresses."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Aucun ID fourni"
@@ -176,14 +186,6 @@ msgstr "Quelque chose est FUBAR."
msgid "Error updating contact property."
msgstr "Erreur lors de la mise à jour du champ."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erreur lors de la mise à jour du carnet d'adresses."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Erreur lors de l'envoi des contacts vers le stockage."
@@ -230,71 +232,78 @@ msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
msgid "Contacts"
msgstr "Contacts"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Pas encore implémenté"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Impossible de trouver une adresse valide."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erreur"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contact"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Nouveau"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Nouveau Contact"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Cette valeur ne doit pas être vide"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Impossible de sérialiser les éléments"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Éditer le nom"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Aucun fichiers choisis pour être chargés"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Sélectionner un type"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Résultat :"
@@ -307,129 +316,133 @@ msgstr "importé,"
msgid " failed."
msgstr "échoué."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Carnet d'adresses introuvable."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ce n'est pas votre carnet d'adresses."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Ce contact n'a pu être trouvé."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Téléphone"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Société"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Travail"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Maison"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobile"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texte"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voix"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Message"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vidéo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Bipeur"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Anniversaire"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Business"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Appel"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Clients"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Livreur"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Vacances"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Idées"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Trajet"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Jubilé"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Rendez-vous"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Autre"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Personnel"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Projets"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Questions"
@@ -449,207 +462,185 @@ msgstr "Importer"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Carnets d'adresses"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Fermer"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Raccourcis clavier"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Navigation"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Contact suivant dans la liste"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Contact précédent dans la liste"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Dé/Replier le carnet d'adresses courant"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Passer au carnet d'adresses suivant/précédent"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Actions"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Actualiser la liste des contacts"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Ajouter un nouveau contact"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Ajouter un nouveau carnet d'adresses"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Effacer le contact sélectionné"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Paramétrer carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nouveau Carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Lien CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Télécharger"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifier"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Supprimer"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Glisser une photo pour l'envoi"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Supprimer la photo actuelle"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editer la photo actuelle"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Envoyer une nouvelle photo"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Sélectionner une photo depuis ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editer les noms"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Supprimer"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Surnom"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Entrer un surnom"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Page web"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Allez à la page web"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "jj-mm-aaaa"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Groupes"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Séparer les groupes avec des virgules"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editer les groupes"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Préféré"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Merci d'entrer une adresse e-mail valide."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Entrer une adresse e-mail"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Envoyer à l'adresse"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Supprimer l'adresse e-mail"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Entrer un numéro de téléphone"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Supprimer le numéro de téléphone"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Voir sur une carte"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editer les adresses"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Ajouter des notes ici."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Ajouter un champ."
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Téléphone"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Note"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Télécharger le contact"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Supprimer le contact"
@@ -808,7 +799,7 @@ msgstr "Nom"
msgid "Active"
msgstr "Carnet actif"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Sauvegarder"
@@ -816,7 +807,7 @@ msgstr "Sauvegarder"
msgid "Submit"
msgstr "Envoyer"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Annuler"
@@ -840,15 +831,15 @@ msgstr "Nom du nouveau carnet d'adresses"
msgid "Importing contacts"
msgstr "Importation des contacts"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Il n'y a pas de contact dans votre carnet d'adresses."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Ajouter un contact"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Paramétrer carnet d'adresses"
@@ -880,6 +871,34 @@ msgstr "Adresse principale"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Télécharger"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifier"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nouveau Carnet d'adresses"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 79d3b618b1f..dfb7e40edfb 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Janvier"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ea9e3f885e9..ad7a053a98f 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 00:49+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Quota par défaut"
msgid "Other"
msgstr "Autre"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "SubAdmin"
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin pour ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Supprimer"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 521bb00899b..24c694cdea4 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Produciuse un erro (des)activando a axenda."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Produciuse un erro engadindo o contacto."
@@ -31,7 +27,9 @@ msgstr "Produciuse un erro engadindo o contacto."
msgid "element name is not set."
msgstr "non se nomeou o elemento."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "non se estableceu o id."
@@ -55,6 +53,18 @@ msgstr "Tentando engadir propiedade duplicada: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Produciuse un erro (des)activando a axenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Produciuse un erro actualizando a axenda."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Non se proveeu ID"
@@ -168,14 +178,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Produciuse un erro actualizando a propiedade do contacto."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Produciuse un erro actualizando a axenda."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Erro subindo os contactos ao almacén."
@@ -222,71 +224,78 @@ msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
msgid "Contacts"
msgstr "Contactos"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Sentímolo, esta función aínda non foi implementada."
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Non implementada."
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Non se puido obter un enderezo de correo válido."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contacto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Esta propiedade non pode quedar baldeira."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Non se puido serializar os elementos."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Editar nome"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Sen ficheiros escollidos para subir."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Seleccione tipo"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -299,129 +308,133 @@ msgstr " importado, "
msgid " failed."
msgstr " fallou."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Non se atopou a libreta de enderezos."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Esta non é a súa axenda."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Non se atopou o contacto."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Enderezo"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Teléfono"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Correo electrónico"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organización"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Traballo"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Casa"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Móbil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voz"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mensaxe"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vídeo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Paxinador"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Aniversario"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "Importar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Axendas"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Pechar"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Libretas de enderezos"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova axenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligazón CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Eliminar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Solte a foto a subir"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Borrar foto actual"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editar a foto actual"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Subir unha nova foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Escoller foto desde ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editar detalles do nome"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Apodo"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Introuza apodo"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupos"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separe grupos con comas"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editar grupos"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Por favor indique un enderezo de correo electrónico válido."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Introduza enderezo de correo electrónico"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Correo ao enderezo"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Borrar enderezo de correo electrónico"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Introducir número de teléfono"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Borrar número de teléfono"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Ver no mapa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editar detalles do enderezo"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Engadir aquí as notas."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Engadir campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Teléfono"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Descargar contacto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Borrar contacto"
@@ -800,7 +791,7 @@ msgstr "Nome a mostrar"
msgid "Active"
msgstr "Activo"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Gardar"
@@ -808,7 +799,7 @@ msgstr "Gardar"
msgid "Submit"
msgstr "Enviar"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancelar"
@@ -832,15 +823,15 @@ msgstr "Nome da nova libreta de enderezos"
msgid "Importing contacts"
msgstr "Importando contactos"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Non ten contactos na súa libreta de enderezos."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Engadir contacto"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configurar libretas de enderezos"
@@ -872,6 +863,34 @@ msgstr "Enderezo primario (Kontact et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova axenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 8da22539ae6..892b9c977f6 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Preferencias"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Xaneiro"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 622cde377c4..2248d0b031b 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Cuota por omisión"
msgid "Other"
msgstr "Outro"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Cota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Borrar"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 08b2d093429..dca49f889e5 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "אירעה שגיאה בעת הוספת איש הקשר."
@@ -32,7 +28,9 @@ msgstr "אירעה שגיאה בעת הוספת איש הקשר."
msgid "element name is not set."
msgstr "שם האלמנט לא נקבע."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "מספר מזהה לא נקבע."
@@ -56,6 +54,18 @@ msgstr "ניסיון להוספת מאפיין כפול: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "שגיאה בעדכון פנקס הכתובות."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "לא צוין מזהה"
@@ -169,14 +179,6 @@ msgstr "משהו לא התנהל כצפוי."
msgid "Error updating contact property."
msgstr "שגיאה בעדכון המאפיין של איש הקשר."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "שגיאה בעדכון פנקס הכתובות."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
@@ -223,71 +225,78 @@ msgstr ""
msgid "Contacts"
msgstr "אנשי קשר"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "איש קשר"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ספר כתובות לא נמצא"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "זהו אינו ספר הכתובות שלך"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "לא ניתן לאתר איש קשר"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "כתובת"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "טלפון"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "דואר אלקטרוני"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "ארגון"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "עבודה"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "בית"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "נייד"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "טקסט"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "קולי"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "הודעה"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "פקס"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "וידאו"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "זימונית"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "אינטרנט"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "יום הולדת"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "יבא"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "פנקסי כתובות"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "הגדר ספרי כתובות"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "פנקס כתובות חדש"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "קישור "
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "הורדה"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "עריכה"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "מחיקה"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "גרור ושחרר תמונה בשביל להעלות"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "מחק תמונה נוכחית"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "ערוך תמונה נוכחית"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "העלה תמונה חדשה"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "בחר תמונה מ ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "ערוך פרטי שם"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "כינוי"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "הכנס כינוי"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "קבוצות"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "הפרד קבוצות עם פסיקים"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "ערוך קבוצות"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "מועדף"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "אנא הזן כתובת דוא\"ל חוקית"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "הזן כתובת דוא\"ל"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "כתובת"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "מחק כתובת דוא\"ל"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "הכנס מספר טלפון"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "מחק מספר טלפון"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "ראה במפה"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "ערוך פרטי כתובת"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "הוסף הערות כאן."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "הוסף שדה"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "טלפון"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "הערה"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "הורדת איש קשר"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "מחיקת איש קשר"
@@ -801,7 +792,7 @@ msgstr "שם התצוגה"
msgid "Active"
msgstr "פעיל"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "שמירה"
@@ -809,7 +800,7 @@ msgstr "שמירה"
msgid "Submit"
msgstr "ביצוע"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "ביטול"
@@ -833,15 +824,15 @@ msgstr "שם ספר כתובות החדש"
msgid "Importing contacts"
msgstr "מיבא אנשי קשר"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "איך לך אנשי קשר בספר הכתובות"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "הוסף איש קשר"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "הגדר ספרי כתובות"
@@ -873,6 +864,34 @@ msgstr "כתובת ראשית"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "הורדה"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "עריכה"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "פנקס כתובות חדש"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index caacbd7897e..9f69d80ad1f 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "ינואר"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 0e2b48f3e68..17af884c073 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "מכסת בררת המחדל"
msgid "Other"
msgstr "אחר"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -212,10 +212,6 @@ msgstr ""
msgid "Quota"
msgstr "מכסה"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "מחיקה"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 52acf5ffa15..a8d9aea13fb 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Pogreška pri (de)aktivaciji adresara."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
@@ -31,7 +27,9 @@ msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
msgid "element name is not set."
msgstr "naziv elementa nije postavljen."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id nije postavljen."
@@ -55,6 +53,18 @@ msgstr "Pokušali ste dodati duplo svojstvo:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Pogreška pri (de)aktivaciji adresara."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Pogreška pri ažuriranju adresara."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nema dodijeljenog ID identifikatora"
@@ -168,14 +178,6 @@ msgstr "Nešto je otišlo... krivo..."
msgid "Error updating contact property."
msgstr "Pogreška pri ažuriranju svojstva kontakta."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Pogreška pri ažuriranju adresara."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Pogreška pri slanju kontakata."
@@ -222,71 +224,78 @@ msgstr ""
msgid "Contacts"
msgstr "Kontakti"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresar nije pronađen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ovo nije vaš adresar."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt ne postoji."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresa"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizacija"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Posao"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Kuća"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobitel"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Glasovno"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Poruka"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Rođendan"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "Uvezi"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresari"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguracija Adresara"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novi adresar"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav poveznica"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Preuzimanje"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Dovucite fotografiju za slanje"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Uredi trenutnu sliku"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Uredi detalje imena"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Nadimak"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Unesi nadimank"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupe"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Uredi grupe"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferirano"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Unesi email adresu"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Unesi broj telefona"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Prikaži na karti"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Uredi detalje adrese"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Dodaj bilješke ovdje."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Dodaj polje"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Bilješka"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Preuzmi kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Izbriši kontakt"
@@ -800,7 +791,7 @@ msgstr "Prikazani naziv"
msgid "Active"
msgstr "Aktivno"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Spremi"
@@ -808,7 +799,7 @@ msgstr "Spremi"
msgid "Submit"
msgstr "Pošalji"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Prekini"
@@ -832,15 +823,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -872,6 +863,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Preuzimanje"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novi adresar"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 48308caf055..bfd1c9f19b9 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Siječanj"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index d853ac5b27f..01ae9d7ee9f 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "standardni kvota"
msgid "Other"
msgstr "ostali"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "kvota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Obriši"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index f524421d03a..5e5420b34df 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Címlista (de)aktiválása sikertelen"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Hiba a kapcsolat hozzáadásakor"
@@ -33,7 +29,9 @@ msgstr "Hiba a kapcsolat hozzáadásakor"
msgid "element name is not set."
msgstr "az elem neve nincs beállítva"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID nincs beállítva"
@@ -57,6 +55,18 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Címlista (de)aktiválása sikertelen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Üres névvel nem frissíthető a címlista"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Hiba a címlista frissítésekor"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nincs ID megadva"
@@ -170,14 +180,6 @@ msgstr "Valami balul sült el."
msgid "Error updating contact property."
msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Üres névvel nem frissíthető a címlista"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Hiba a címlista frissítésekor"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Hiba a kapcsolatok feltöltésekor"
@@ -224,71 +226,78 @@ msgstr "Nem történt feltöltés. Ismeretlen hiba"
msgid "Contacts"
msgstr "Kapcsolatok"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Sajnáljuk, ez a funkció még nem támogatott"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Nem támogatott"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Érvényes cím lekérése sikertelen"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hiba"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kapcsolat"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Ezt a tulajdonságot muszáj kitölteni"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Sorbarakás sikertelen"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Név szerkesztése"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Nincs kiválasztva feltöltendő fájl"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Típus kiválasztása"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Eredmény: "
@@ -301,129 +310,133 @@ msgstr " beimportálva, "
msgid " failed."
msgstr " sikertelen"
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Címlista nem található"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ez nem a te címjegyzéked."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kapcsolat nem található."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Cím"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefonszám"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Szervezet"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Munkahelyi"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Otthoni"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobiltelefonszám"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Szöveg"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Hang"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Üzenet"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Személyhívó"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Születésnap"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -443,207 +456,185 @@ msgstr "Import"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Címlisták"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Bezár"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Címlisták beállítása"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Új címlista"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav hivatkozás"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Letöltés"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Törlés"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Húzza ide a feltöltendő képet"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Aktuális kép törlése"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Aktuális kép szerkesztése"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Új kép feltöltése"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Kép kiválasztása ownCloud-ból"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Név részleteinek szerkesztése"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Becenév"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Becenév megadása"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "yyyy-mm-dd"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Csoportok"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Vesszővel válassza el a csoportokat"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Csoportok szerkesztése"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Előnyben részesített"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Adjon meg érvényes email címet"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Adja meg az email címet"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Postai cím"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Email cím törlése"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Adja meg a telefonszámot"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Telefonszám törlése"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Megtekintés a térképen"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Cím részleteinek szerkesztése"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Megjegyzések"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Mező hozzáadása"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefonszám"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Jegyzet"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Kapcsolat letöltése"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Kapcsolat törlése"
@@ -802,7 +793,7 @@ msgstr "Megjelenített név"
msgid "Active"
msgstr "Aktív"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Mentés"
@@ -810,7 +801,7 @@ msgstr "Mentés"
msgid "Submit"
msgstr "Elküld"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Mégsem"
@@ -834,15 +825,15 @@ msgstr "Új címlista neve"
msgid "Importing contacts"
msgstr "Kapcsolatok importálása"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Nincsenek kapcsolatok a címlistában"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Kapcsolat hozzáadása"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Címlisták beállítása"
@@ -874,6 +865,34 @@ msgstr "Elsődleges cím"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Új címlista"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a40b764ad40..928cb018978 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Január"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5a646b0f67d..47d040cef6a 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Alapértelmezett kvóta"
msgid "Other"
msgstr "Egyéb"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvóta"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Törlés"
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 8916c610f80..b89ca65c8d8 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f7c8e7693a4..bcf3a0d20c7 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 9538d201b8e..1d18d1b9fd0 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index d41fa3c8fa0..30a6e588b42 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -31,7 +27,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -55,6 +53,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
msgid "Contacts"
msgstr "Contactos"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contacto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressario non trovate."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Iste non es tu libro de adresses"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Contacto non poterea esser legite"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telephono"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-posta"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisation"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Travalio"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Domo"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobile"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voce"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Message"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Anniversario"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "Importar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressarios"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nove adressario"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligamine CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Discargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modificar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Deler"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Deler photo currente"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Modificar photo currente"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Incargar nove photo"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Seliger photo ex ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Pseudonymo"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Inserer pseudonymo"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Gruppos"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Modificar gruppos"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferite"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Entrar un adresse de e-posta"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Deler adresse de E-posta"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Entrar un numero de telephono"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Deler numero de telephono"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Vider in un carta"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Adder notas hic"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Adder campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Phono"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Discargar contacto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Deler contacto"
@@ -800,7 +791,7 @@ msgstr ""
msgid "Active"
msgstr "Active"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Salveguardar"
@@ -808,7 +799,7 @@ msgstr "Salveguardar"
msgid "Submit"
msgstr "Submitter"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancellar"
@@ -832,15 +823,15 @@ msgstr "Nomine del nove gruppo:"
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Adder adressario"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -872,6 +863,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Discargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modificar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nove adressario"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index fe4466de6b0..bd15bf5a904 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 20a6dc619a0..17d5ea37822 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Quota predeterminate"
msgid "Other"
msgstr "Altere"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Deler"
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 46c23dd903f..84104f841cc 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index dbfdf233126..6245505a80b 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index e33802637fe..ab9bd793545 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Kuota default"
msgid "Other"
msgstr "Lain-lain"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Hapus"
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 0efd77c3ec3..b7347b2b7de 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: id_ID\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 1434c85e1d8..0d43d3618c8 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index e28f303b929..c8cf7eb0de4 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index a6d51ee4f5e..7a2687c7969 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Errore nel (dis)attivare la rubrica."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Si è verificato un errore nell'aggiunta del contatto."
@@ -33,7 +29,9 @@ msgstr "Si è verificato un errore nell'aggiunta del contatto."
msgid "element name is not set."
msgstr "il nome dell'elemento non è impostato."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID non impostato."
@@ -57,6 +55,18 @@ msgstr "P"
msgid "Error adding contact property: "
msgstr "Errore durante l'aggiunta della proprietà del contatto: "
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore nel (dis)attivare la rubrica."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossibile aggiornare una rubrica senza nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore durante l'aggiornamento della rubrica."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nessun ID fornito"
@@ -170,14 +180,6 @@ msgstr "Qualcosa è andato storto. "
msgid "Error updating contact property."
msgstr "Errore durante l'aggiornamento della proprietà del contatto."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossibile aggiornare una rubrica senza nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore durante l'aggiornamento della rubrica."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Errore di invio dei contatti in archivio."
@@ -224,71 +226,78 @@ msgstr "Nessun file è stato inviato. Errore sconosciuto"
msgid "Contacts"
msgstr "Contatti"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Non implementata"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Impossibile ottenere un indirizzo valido."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errore"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contatto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Nuovo"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Nuovo contatto"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Questa proprietà non può essere vuota."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Impossibile serializzare gli elementi."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Modifica il nome"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Nessun file selezionato per l'invio"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Seleziona il tipo"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Risultato: "
@@ -301,129 +310,133 @@ msgstr " importato, "
msgid " failed."
msgstr " non riuscito."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Rubrica non trovata."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Questa non è la tua rubrica."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Il contatto non può essere trovato."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Indirizzo"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefono"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizzazione"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Lavoro"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Casa"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Cellulare"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Testo"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voce"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Messaggio"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Cercapersone"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Compleanno"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Lavoro"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Chiama"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Client"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Corriere"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Festività"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Idee"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Viaggio"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Anniversario"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Riunione"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Altro"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Personale"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Progetti"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Domande"
@@ -443,207 +456,185 @@ msgstr "Importa"
msgid "Settings"
msgstr "Impostazioni"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Rubriche"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Chiudi"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Scorciatoie da tastiera"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Navigazione"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Contatto successivo in elenco"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Contatto precedente in elenco"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Espandi/Contrai la rubrica corrente"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Rubrica successiva/precedente"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Azioni"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Aggiorna l'elenco dei contatti"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Aggiungi un nuovo contatto"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Aggiungi una nuova rubrica"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Elimina il contatto corrente"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura rubrica"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nuova rubrica"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Scarica"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifica"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Elimina"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Rilascia una foto da inviare"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Elimina la foto corrente"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Modifica la foto corrente"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Invia una nuova foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Seleziona la foto da ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Modifica dettagli del nome"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Pseudonimo"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Inserisci pseudonimo"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Sito web"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Vai al sito web"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "gg-mm-aaaa"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Gruppi"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separa i gruppi con virgole"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Modifica gruppi"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferito"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Specifica un indirizzo email valido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Inserisci indirizzo email"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Invia per email"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Elimina l'indirizzo email"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Inserisci il numero di telefono"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Elimina il numero di telefono"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Visualizza sulla mappa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Modifica dettagli dell'indirizzo"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Aggiungi qui le note."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Aggiungi campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefono"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Scarica contatto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Elimina contatto"
@@ -802,7 +793,7 @@ msgstr "Nome visualizzato"
msgid "Active"
msgstr "Attiva"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Salva"
@@ -810,7 +801,7 @@ msgstr "Salva"
msgid "Submit"
msgstr "Invia"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Annulla"
@@ -834,15 +825,15 @@ msgstr "Nome della nuova rubrica"
msgid "Importing contacts"
msgstr "Importazione contatti"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Non hai contatti nella rubrica."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Aggiungi contatto"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configura rubriche"
@@ -874,6 +865,34 @@ msgstr "Indirizzo principale (Kontact e altri)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Collegamento(i) cartella vCard sola lettura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Scarica"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifica"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nuova rubrica"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 034071bef13..95cfeb14f43 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr "Errore di caricamento dello script per le impostazioni"
-
#: js/js.js:573
msgid "January"
msgstr "Gennaio"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 475f87fd920..c31a629ac47 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 05:39+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Quota predefinita"
msgid "Other"
msgstr "Altro"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "SubAdmin"
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
msgid "Quota"
msgstr "Quote"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Elimina"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1f8cbc10ecf..687698a3cda 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "アドレスブックの有効/無効化に失敗しました。"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "連絡先の追加でエラーが発生しました。"
@@ -30,7 +26,9 @@ msgstr "連絡先の追加でエラーが発生しました。"
msgid "element name is not set."
msgstr "要素名が設定されていません。"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "idが設定されていません。"
@@ -52,7 +50,19 @@ msgstr "重複する属性を追加: "
#: ajax/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "コンタクト属性の追加エラー: "
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "アドレスブックの有効/無効化に失敗しました。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "空白の名前でアドレスブックを更新することはできません。"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "アドレスブックの更新に失敗しました。"
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "連絡先の更新に失敗しました。"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "空白の名前でアドレスブックを更新することはできません。"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "アドレスブックの更新に失敗しました。"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "ストレージへの連絡先のアップロードエラー。"
@@ -221,71 +223,78 @@ msgstr "ファイルは何もアップロードされていません。不明な
msgid "Contacts"
msgstr "連絡先"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "申し訳ありません。この機能はまだ実装されていません"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "未実装"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "有効なアドレスを取得できませんでした。"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "エラー"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "連絡先"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
-msgstr ""
+msgstr "新規"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
-msgstr ""
+msgstr "新しいコンタクト"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "この属性は空にできません。"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "要素をシリアライズできませんでした。"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "名前を編集"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "アップロードするファイルが選択されていません。"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "タイプを選択"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "結果: "
@@ -298,131 +307,135 @@ msgstr " をインポート、 "
msgid " failed."
msgstr " は失敗しました。"
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "アドレスブックが見つかりませんでした。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "これはあなたの電話帳ではありません。"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "連絡先を見つける事ができません。"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "住所"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "電話番号"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "メールアドレス"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "所属"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "勤務先"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "住居"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "携帯電話"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "TTY TDD"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "音声番号"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "メッセージ"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "FAX"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "テレビ電話"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "ポケベル"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "インターネット"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "誕生日"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "ビジネス"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "顧客"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "運送会社"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "休日"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "アイデア"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "旅行"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "記念祭"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "打ち合わせ"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "その他"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "個人"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "プロジェクト"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "質問"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -438,209 +451,187 @@ msgstr "インポート"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "設定"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "電話帳"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "閉じる"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "キーボードショートカット"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
-msgstr ""
+msgstr "ナビゲーション"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
-msgstr ""
+msgstr "リスト内の次のコンタクト"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
-msgstr ""
+msgstr "リスト内の前のコンタクト"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "新しいコンタクトを追加"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックを追加"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "アドレスブックを設定"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新規電話帳"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAVリンク"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "ダウンロード"
+msgstr "現在のコンタクトを削除"
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "編集"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "削除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "写真をドロップしてアップロード"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "現在の写真を削除"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "現在の写真を編集"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "新しい写真をアップロード"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "ownCloudから写真を選択"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "名前の詳細を編集"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "削除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "ニックネーム"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "ニックネームを入力"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "ウェブサイト"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "yyyy-mm-dd"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "グループ"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "コンマでグループを分割"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "グループを編集"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "推奨"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "連絡先を追加"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "メールアドレスを入力"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "アドレスへメールを送る"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "メールアドレスを削除"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "電話番号を入力"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "電話番号を削除"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "地図で表示"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "住所の詳細を編集"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "ここにメモを追加。"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "項目を追加"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "電話番号"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "メモ"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "連絡先のダウンロード"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "連絡先の削除"
@@ -696,7 +687,7 @@ msgstr "郵便番号"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "郵便番号"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -799,7 +790,7 @@ msgstr "表示名"
msgid "Active"
msgstr "アクティブ"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "保存"
@@ -807,7 +798,7 @@ msgstr "保存"
msgid "Submit"
msgstr "送信"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "取り消し"
@@ -831,15 +822,15 @@ msgstr "新しいアドレスブックの名前"
msgid "Importing contacts"
msgstr "コンタクトをインポート"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "アドレスブックに連絡先が登録されていません。"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "連絡先を追加"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "アドレス帳を設定"
@@ -849,7 +840,7 @@ msgstr ""
#: templates/part.selectaddressbook.php:20
msgid "Enter name"
-msgstr ""
+msgstr "名前を入力"
#: templates/part.selectaddressbook.php:22
msgid "Enter description"
@@ -871,6 +862,34 @@ msgstr "プライマリアドレス(Kontact 他)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編集"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新規電話帳"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 6aa6c326c5b..18c7f43a644 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "設定"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "1月"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 1bc2d2cc7f6..d4898890012 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "無効なリクエストです"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "認証エラー"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -60,7 +60,7 @@ msgstr "Japanese (日本語)"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "セキュリティ警告"
#: templates/admin.php:28
msgid "Log"
@@ -202,7 +202,7 @@ msgstr "デフォルトのクォータサイズ"
msgid "Other"
msgstr "その他"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "クオータ"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "削除"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 3d9e441fab3..0bf8fd46046 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "주소록을 (비)활성화하는 데 실패했습니다."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
@@ -31,7 +27,9 @@ msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
msgid "element name is not set."
msgstr "element 이름이 설정되지 않았습니다."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "아이디가 설정되어 있지 않습니다. "
@@ -55,6 +53,18 @@ msgstr "중복 속성 추가 시도: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "주소록을 (비)활성화하는 데 실패했습니다."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "주소록을 업데이트할 수 없습니다."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "제공되는 아이디 없음"
@@ -168,14 +178,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "연락처 속성을 업데이트할 수 없습니다."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "주소록을 업데이트할 수 없습니다."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "스토리지 에러 업로드 연락처."
@@ -222,71 +224,78 @@ msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
msgid "Contacts"
msgstr "연락처"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "구현되지 않음"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "유효한 주소를 얻을 수 없습니다."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "오류"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "연락처"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "요소를 직렬화 할 수 없습니다."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "이름 편집"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "유형 선택"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "결과:"
@@ -299,129 +308,133 @@ msgstr "불러오기,"
msgid " failed."
msgstr "실패."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "주소록을 찾을 수 없습니다."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "내 주소록이 아닙니다."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "연락처를 찾을 수 없습니다."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "주소"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "전화 번호"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "전자 우편"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "조직"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "직장"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "자택"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "휴대폰"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "문자 번호"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "음성 번호"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "메세지"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "팩스 번호"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "영상 번호"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "호출기"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "인터넷"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "생일"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "입력"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "주소록"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "닫기"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "주소록 구성"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "새 주소록"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 링크"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "다운로드"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "편집"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "삭제"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Drop photo to upload"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "현재 사진 삭제"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "현재 사진 편집"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "새로운 사진 업로드"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "ownCloud에서 사진 선택"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "이름 세부사항을 편집합니다. "
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "삭제"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "별명"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "별명 입력"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "일-월-년"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "그룹"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "쉼표로 그룹 구분"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "그룹 편집"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "선호함"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "올바른 이메일 주소를 입력하세요."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "이메일 주소 입력"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "이메일 주소 삭제"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "전화번호 입력"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "전화번호 삭제"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "지도에서 보기"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "상세 주소 수정"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "여기에 노트 추가."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "파일 추가"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "전화 번호"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "노트"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "연락처 다운로드"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "연락처 삭제"
@@ -800,7 +791,7 @@ msgstr "표시 이름"
msgid "Active"
msgstr "활성"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "저장"
@@ -808,7 +799,7 @@ msgstr "저장"
msgid "Submit"
msgstr "보내기"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "취소"
@@ -832,15 +823,15 @@ msgstr "새 주소록 이름"
msgid "Importing contacts"
msgstr "연락처 입력"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "당신의 주소록에는 연락처가 없습니다. "
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "연락처 추가"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "주소록 구성"
@@ -872,6 +863,34 @@ msgstr "기본 주소 (Kontact et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "다운로드"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "편집"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "새 주소록"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 948625d1cce..aaed23a766f 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "설정"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "1월"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 51dbed056b4..80fd8867321 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "기본 할당량"
msgid "Other"
msgstr "다른"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "할당량"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "삭제"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index fe4a8a044e5..f6717af86fe 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Fehler beim bäisetzen vun engem Kontakt."
@@ -30,7 +26,9 @@ msgstr "Fehler beim bäisetzen vun engem Kontakt."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID ass net gesat."
@@ -54,6 +52,18 @@ msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fehler beim updaten vum Adressbuch."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Keng ID uginn"
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fehler beim updaten vum Adressbuch."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr "Kontakter"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -298,129 +307,133 @@ msgstr " importéiert, "
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch net fonnt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dat do ass net däin Adressbuch."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Konnt den Kontakt net fannen."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adress"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon's Nummer"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Firma"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Aarbecht"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Doheem"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "GSM"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "SMS"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voice"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Message"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Gebuertsdag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressbicher "
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Zoumaachen"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbicher konfigureiren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neit Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editéieren"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Läschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Spëtznumm"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Gëff e Spëtznumm an"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Gruppen"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Gruppen editéieren"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Telefonsnummer aginn"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Telefonsnummer läschen"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Op da Kaart uweisen"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Adress Detailer editéieren"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Note"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Kontakt eroflueden"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Kontakt läschen"
@@ -799,7 +790,7 @@ msgstr "Ugewisene Numm"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Späicheren"
@@ -807,7 +798,7 @@ msgstr "Späicheren"
msgid "Submit"
msgstr "Fortschécken"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Ofbriechen"
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editéieren"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neit Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 04a5957160a..992723898f7 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 705509ed4d4..0d5bf0ad10d 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Standard Quota"
msgid "Other"
msgstr "Aner"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Läschen"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index c6f544cbda5..b63e058e0e2 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Klaida (de)aktyvuojant adresų knygą."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Pridedant kontaktą įvyko klaida."
@@ -30,7 +26,9 @@ msgstr "Pridedant kontaktą įvyko klaida."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Klaida (de)aktyvuojant adresų knygą."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr "Kontaktai"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontaktas"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nerasta adresų knyga."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Tai ne jūsų adresų knygelė."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontaktas nerastas"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresas"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefonas"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "El. paštas"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizacija"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Darbo"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Namų"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobilusis"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Žinučių"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Balso"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Žinutė"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faksas"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vaizdo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pranešimų gaviklis"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internetas"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Gimtadienis"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresų knygos"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigūruoti adresų knygas"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nauja adresų knyga"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV nuoroda"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Atsisiųsti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Keisti"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Trinti"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Trinti"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Slapyvardis"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefonas"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Atsisųsti kontaktą"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Ištrinti kontaktą"
@@ -799,7 +790,7 @@ msgstr "Rodomas vardas"
msgid "Active"
msgstr "Aktyvus"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Išsaugoti"
@@ -807,7 +798,7 @@ msgstr "Išsaugoti"
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Atšaukti"
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Atsisiųsti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Keisti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nauja adresų knyga"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 3dfbbfaf40a..60b338d51cc 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Sausis"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 0986258c8b7..d0f1fd44886 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Numatytoji kvota"
msgid "Other"
msgstr "Kita"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "Limitas"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Ištrinti"
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 0b80baf9b44..c47721670c7 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 0c20b3c4651..a9c0fffbecb 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index fbc7ad0283c..03f11cf4f64 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Apjoms pēc noklusējuma"
msgid "Other"
msgstr "Cits"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "Apjoms"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Izdzēst"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 3af06736fa5..4b32b8a1e6b 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Грешка (де)активирање на адресарот."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Имаше грешка при додавање на контактот."
@@ -31,7 +27,9 @@ msgstr "Имаше грешка при додавање на контактот.
msgid "element name is not set."
msgstr "име за елементот не е поставена."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ид не е поставено."
@@ -55,6 +53,18 @@ msgstr "Се обидовте да внесете дупликат вредно
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Грешка (де)активирање на адресарот."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Неможе да се ажурира адресар со празно име."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Грешка при ажурирање на адресарот."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Нема доставено ИД"
@@ -168,14 +178,6 @@ msgstr "Нешто се расипа."
msgid "Error updating contact property."
msgstr "Грешка при ажурирање на вредноста за контакт."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Неможе да се ажурира адресар со празно име."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Грешка при ажурирање на адресарот."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Грешка во снимање на контактите на диск."
@@ -222,71 +224,78 @@ msgstr "Ниту еден фајл не се вчита. Непозната гр
msgid "Contacts"
msgstr "Контакти"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Жалам, оваа функционалност уште не е имплементирана"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Не е имплементирано"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Не можев да добијам исправна адреса."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Грешка"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Контакт"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Својството не смее да биде празно."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Не може да се серијализираат елементите."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Уреди го името"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Ниту еден фајл не е избран за вчитување."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Одбери тип"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Резултат: "
@@ -299,129 +308,133 @@ msgstr "увезено,"
msgid " failed."
msgstr "неуспешно."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресарот не е најден."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ова не е во Вашиот адресар."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Контактот неможе да биде најден."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Адреса"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Телефон"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Е-пошта"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Организација"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Работа"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Дома"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Мобилен"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Текст"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Глас"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Порака"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Факс"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Видео"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Пејџер"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Интернет"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Роденден"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "Внеси"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Адресари"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Затвои"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Конфигурирај адресар"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нов адресар"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Врска за CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Преземи"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Уреди"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Избриши"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Довлечкај фотографија за да се подигне"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Избриши моментална фотографија"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Уреди моментална фотографија"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Подигни нова фотографија"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Изберете фотографија од ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Уреди детали за име"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Избриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Прекар"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Внеси прекар"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Групи"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Одвоете ги групите со запирка"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Уреди групи"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Претпочитано"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Ве молам внесете правилна адреса за е-пошта."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Внесете е-пошта"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Прати порака до адреса"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Избриши адреса за е-пошта"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Внесете телефонски број"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Избриши телефонски број"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Погледајте на мапа"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Уреди детали за адреса"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Внесете забелешки тука."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Додади поле"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Телефон"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Забелешка"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Преземи го контактот"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Избриши го контактот"
@@ -800,7 +791,7 @@ msgstr "Прикажано име"
msgid "Active"
msgstr "Активно"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Сними"
@@ -808,7 +799,7 @@ msgstr "Сними"
msgid "Submit"
msgstr "Прати"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Откажи"
@@ -832,15 +823,15 @@ msgstr "Име на новиот адресар"
msgid "Importing contacts"
msgstr "Внесување контакти"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Немате контакти во Вашиот адресар."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Додади контакт"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Уреди адресари"
@@ -872,6 +863,34 @@ msgstr "Примарна адреса"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преземи"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нов адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 679185b78f8..845e2aa68c7 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Поставки"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Јануари"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index ef930d96598..45521a471d7 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Предефинирана квота"
msgid "Other"
msgstr "Останато"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Квота"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Избриши"
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 1bab894cc66..0bb905bda62 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ralat nyahaktif buku alamat."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Terdapat masalah menambah maklumat."
@@ -33,7 +29,9 @@ msgstr "Terdapat masalah menambah maklumat."
msgid "element name is not set."
msgstr "nama elemen tidak ditetapkan."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID tidak ditetapkan."
@@ -57,6 +55,18 @@ msgstr "Cuba untuk letak nilai duplikasi:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ralat nyahaktif buku alamat."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Masalah mengemaskini buku alamat."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "tiada ID diberi"
@@ -170,14 +180,6 @@ msgstr "Sesuatu tidak betul."
msgid "Error updating contact property."
msgstr "Masalah mengemaskini maklumat."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Masalah mengemaskini buku alamat."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Ralat memuatnaik senarai kenalan."
@@ -224,71 +226,78 @@ msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
msgid "Contacts"
msgstr "Hubungan-hubungan"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Tidak digunakan"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Tidak boleh mendapat alamat yang sah."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ralat"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Hubungan"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Nilai ini tidak boleh kosong."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Tidak boleh menggabungkan elemen."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Ubah nama"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Tiada fail dipilih untuk muatnaik."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "PIlih jenis"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Hasil: "
@@ -301,129 +310,133 @@ msgstr " import, "
msgid " failed."
msgstr " gagal."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Buku alamat tidak dijumpai."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ini bukan buku alamat anda."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Hubungan tidak dapat ditemui"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Alamat"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Emel"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisasi"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Kerja"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Rumah"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mudah alih"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Teks"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Suara"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mesej"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Alat Kelui"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Hari lahir"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -443,207 +456,185 @@ msgstr "Import"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Senarai Buku Alamat"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Tutup"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurasi Buku Alamat"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Buku Alamat Baru"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Sambungan CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Muat naik"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sunting"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Padam"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Letak foto disini untuk muatnaik"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Padam foto semasa"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Ubah foto semasa"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Muatnaik foto baru"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Pilih foto dari ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Ubah butiran nama"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Padam"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Nama Samaran"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Masukkan nama samaran"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Kumpulan"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Asingkan kumpulan dengan koma"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Ubah kumpulan"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Pilihan"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Berikan alamat emel yang sah."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Masukkan alamat emel"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Hantar ke alamat"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Padam alamat emel"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Masukkan nombor telefon"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Padam nombor telefon"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Lihat pada peta"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Ubah butiran alamat"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Letak nota disini."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Letak ruangan"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Muat turun hubungan"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Padam hubungan"
@@ -802,7 +793,7 @@ msgstr "Paparan nama"
msgid "Active"
msgstr "Aktif"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Simpan"
@@ -810,7 +801,7 @@ msgstr "Simpan"
msgid "Submit"
msgstr "Hantar"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Batal"
@@ -834,15 +825,15 @@ msgstr "Nama buku alamat"
msgid "Importing contacts"
msgstr "Import senarai kenalan"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Letak kenalan"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfigurasi buku alamat"
@@ -874,6 +865,34 @@ msgstr "Alamat utama"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Muat naik"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sunting"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Buku Alamat Baru"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index ee0e7eeea28..468102d63d9 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januari"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index ac982981486..ef9fb19e53f 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@ msgstr "Kuota Lalai"
msgid "Other"
msgstr "Lain"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -213,10 +213,6 @@ msgstr ""
msgid "Quota"
msgstr "Kuota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Padam"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 291e1afa10a..c3a53c33804 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Et problem oppsto med å (de)aktivere adresseboken."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Et problem oppsto med å legge til kontakten."
@@ -33,7 +29,9 @@ msgstr "Et problem oppsto med å legge til kontakten."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id er ikke satt."
@@ -57,6 +55,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Et problem oppsto med å (de)aktivere adresseboken."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke oppdatere adressebøker uten navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Et problem oppsto med å oppdatere adresseboken."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Ingen ID angitt"
@@ -170,14 +180,6 @@ msgstr "Noe gikk fryktelig galt."
msgid "Error updating contact property."
msgstr "Et problem oppsto med å legge til kontaktfeltet."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan ikke oppdatere adressebøker uten navn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Et problem oppsto med å oppdatere adresseboken."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
@@ -224,71 +226,78 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
msgid "Contacts"
msgstr "Kontakter"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Feil"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Endre navn"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Ingen filer valgt for opplasting."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filen du prøver å laste opp er for stor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Velg type"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -301,129 +310,133 @@ msgstr "importert,"
msgid " failed."
msgstr "feilet."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresseboken ble ikke funnet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dette er ikke dine adressebok."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakten ble ikke funnet."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-post"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisasjon"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Arbeid"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Hjem"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Svarer"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Melding"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internett"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Bursdag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -443,207 +456,185 @@ msgstr "Importer"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressebøker"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Lukk"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebok"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV-lenke"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Hent ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Dra bilder hit for å laste opp"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Fjern nåværende bilde"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Rediger nåværende bilde"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Last opp nytt bilde"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Velg bilde fra ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Endre detaljer rundt navn"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Kallenavn"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Skriv inn kallenavn"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-åååå"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupper"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Skill gruppene med komma"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Endre grupper"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Foretrukket"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Vennligst angi en gyldig e-postadresse."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Skriv inn e-postadresse"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Send e-post til adresse"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Fjern e-postadresse"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Skriv inn telefonnummer"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Fjern telefonnummer"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Se på kart"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Endre detaljer rundt adresse"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Legg inn notater her."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Legg til felt"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Notat"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Hend ned kontakten"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Slett kontakt"
@@ -802,7 +793,7 @@ msgstr "Visningsnavn"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Lagre"
@@ -810,7 +801,7 @@ msgstr "Lagre"
msgid "Submit"
msgstr "Lagre"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Avbryt"
@@ -834,15 +825,15 @@ msgstr "Navn på ny adressebok"
msgid "Importing contacts"
msgstr "Importerer kontakter"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Du har ingen kontakter i din adressebok"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Ny kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfigurer adressebøker"
@@ -874,6 +865,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Hent ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index b22e6e9fc1e..010ea337041 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januar"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index f423532a21e..fbf111c4d38 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Standard Kvote"
msgid "Other"
msgstr "Annet"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -214,10 +214,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvote"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Slett"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index a67a5736890..5c574cdc683 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fout bij het (de)activeren van het adresboek."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Er was een fout bij het toevoegen van het contact."
@@ -34,7 +30,9 @@ msgstr "Er was een fout bij het toevoegen van het contact."
msgid "element name is not set."
msgstr "onderdeel naam is niet opgegeven."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id is niet ingesteld."
@@ -58,6 +56,18 @@ msgstr "Eigenschap bestaat al: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fout bij het (de)activeren van het adresboek."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan adresboek zonder naam niet wijzigen"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fout bij het updaten van het adresboek."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Geen ID opgegeven"
@@ -171,14 +181,6 @@ msgstr "Er ging iets totaal verkeerd. "
msgid "Error updating contact property."
msgstr "Fout bij het updaten van de contacteigenschap."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan adresboek zonder naam niet wijzigen"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fout bij het updaten van het adresboek."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Fout bij opslaan van contacten."
@@ -225,71 +227,78 @@ msgstr ""
msgid "Contacts"
msgstr "Contacten"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contact"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -302,129 +311,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresboek niet gevonden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dit is niet uw adresboek."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Contact kon niet worden gevonden."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adres"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefoon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisatie"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Werk"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Thuis"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobiel"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Stem"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Bericht"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pieper"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Verjaardag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -444,207 +457,185 @@ msgstr "Importeer"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresboeken"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Instellen adresboeken"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nieuw Adresboek"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bewerken"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Verwijder foto uit upload"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Verwijdere huidige foto"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Wijzig huidige foto"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Upload nieuwe foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Selecteer foto uit ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Wijzig naam gegevens"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Roepnaam"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Voer roepnaam in"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Groepen"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Gebruik komma bij meerder groepen"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Wijzig groepen"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Voorkeur"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Geef een geldig email adres op."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Voer email adres in"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Mail naar adres"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Verwijder email adres"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Voer telefoonnummer in"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Verwijdere telefoonnummer"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Bekijk op een kaart"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Wijzig adres gegevens"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Voeg notitie toe"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Voeg veld toe"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefoon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Notitie"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Download contact"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Verwijder contact"
@@ -803,7 +794,7 @@ msgstr "Weergavenaam"
msgid "Active"
msgstr "Actief"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Opslaan"
@@ -811,7 +802,7 @@ msgstr "Opslaan"
msgid "Submit"
msgstr "Opslaan"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Anuleren"
@@ -835,15 +826,15 @@ msgstr "Naam van nieuw adresboek"
msgid "Importing contacts"
msgstr "Importeren van contacten"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Je hebt geen contacten in je adresboek"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Contactpersoon toevoegen"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Bewerken adresboeken"
@@ -875,6 +866,34 @@ msgstr "Standaardadres"
msgid "iOS/OS X"
msgstr "IOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bewerken"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nieuw Adresboek"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 587342c1fca..cdbdada846a 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr ""
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januari"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index daccd5ac074..2f187905145 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,7 @@ msgstr "Standaard limiet"
msgid "Other"
msgstr "Andere"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -215,10 +215,6 @@ msgstr ""
msgid "Quota"
msgstr "Limieten"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "verwijderen"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index ceeea1a2bd0..77dbe1e05a2 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Det kom ei feilmelding då kontakta vart lagt til."
@@ -31,7 +27,9 @@ msgstr "Det kom ei feilmelding då kontakta vart lagt til."
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -55,6 +53,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eit problem oppstod ved å oppdatere adresseboka."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Eit problem oppstod ved å endre kontaktfeltet."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eit problem oppstod ved å oppdatere adresseboka."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
msgid "Contacts"
msgstr "Kotaktar"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Dette er ikkje di adressebok."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Fann ikkje kontakten."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresse"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefonnummer"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Epost"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisasjon"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Arbeid"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Heime"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Tale"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Personsøkjar"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Bursdag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressebøker"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lenkje"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Endra"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Føretrekt"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefonnummer"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Last ned kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Slett kontakt"
@@ -800,7 +791,7 @@ msgstr "Visningsnamn"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Lagre"
@@ -808,7 +799,7 @@ msgstr "Lagre"
msgid "Submit"
msgstr "Send"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Kanseller"
@@ -832,15 +823,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -872,6 +863,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Last ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Endra"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6374219085a..707892db958 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 99195922f1c..72badad24b8 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvote"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Slett"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index c6c1bf1a2d0..d46b2f8b6dd 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Błąd (de)aktywowania książki adresowej."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Wystąpił błąd podczas dodawania kontaktu."
@@ -33,13 +29,15 @@ msgstr "Wystąpił błąd podczas dodawania kontaktu."
msgid "element name is not set."
msgstr "nazwa elementu nie jest ustawiona."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id nie ustawione."
#: ajax/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Nie można parsować kontaktu:"
#: ajax/addproperty.php:56
msgid "Cannot add empty property."
@@ -55,7 +53,19 @@ msgstr "Próba dodania z duplikowanej właściwości:"
#: ajax/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Błąd przy dodawaniu właściwości kontaktu:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Błąd (de)aktywowania książki adresowej."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Błąd uaktualniania książki adresowej."
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
@@ -170,14 +180,6 @@ msgstr "Gdyby coś poszło FUBAR."
msgid "Error updating contact property."
msgstr "Błąd uaktualniania elementu."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Błąd uaktualniania książki adresowej."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
@@ -224,71 +226,78 @@ msgstr "Plik nie został załadowany. Nieznany błąd"
msgid "Contacts"
msgstr "Kontakty"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Nie wdrożono"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Nie można pobrać prawidłowego adresu."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Błąd"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
-msgstr ""
+msgstr "Nowy"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
-msgstr ""
+msgstr "Nowy kontakt"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Ta właściwość nie może być pusta."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Nie można serializować elementów."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Zmień nazwę"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Wybierz typ"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Wynik: "
@@ -301,131 +310,135 @@ msgstr " importowane, "
msgid " failed."
msgstr " nie powiodło się."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nie znaleziono książki adresowej"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "To nie jest Twoja książka adresowa."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Nie można odnaleźć kontaktu."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adres"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizacja"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Praca"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Dom"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Komórka"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Połączenie tekstowe"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Połączenie głosowe"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Wiadomość"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Połączenie wideo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Urodziny"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "Biznesowe"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Klienci"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Święta"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Pomysły"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Podróż"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Spotkanie"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Inne"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Osobiste"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Projekty"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Pytania"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -441,209 +454,187 @@ msgstr "Import"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Ustawienia"
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Książki adresowe"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Zamknij"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Skróty klawiatury"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
-msgstr ""
+msgstr "Nawigacja"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
-msgstr ""
+msgstr "Następny kontakt na liście"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
-msgstr ""
+msgstr "Poprzedni kontakt na liście"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Następna/poprzednia książka adresowa"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Akcje"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Odśwież listę kontaktów"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nowy kontakt"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nowa książkę adresową"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguruj książkę adresową"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nowa książka adresowa"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Wyświetla odnośnik CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Pobiera książkę adresową"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edytuje książkę adresową"
+msgstr "Usuń obecny kontakt"
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Usuwa książkę adresową"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Upuść fotografię aby załadować"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Usuń aktualne zdjęcie"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Edytuj aktualne zdjęcie"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Wczytaj nowe zdjęcie"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Wybierz zdjęcie z ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Edytuj szczegóły nazwy"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Usuwa książkę adresową"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Nazwa"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Wpisz nazwę"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Strona www"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.jakasstrona.pl"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Idż do strony www"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-rrrr"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupy"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Oddziel grupy przecinkami"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Edytuj grupy"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferowane"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Określ prawidłowy adres e-mail."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Wpisz adres email"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Mail na adres"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Usuń adres mailowy"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Wpisz numer telefonu"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Usuń numer telefonu"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Zobacz na mapie"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Edytuj szczegóły adresu"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Dodaj notatkę tutaj."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Dodaj pole"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Uwaga"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Pobiera kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Usuwa kontakt"
@@ -670,7 +661,7 @@ msgstr ""
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Ulica i numer"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -699,7 +690,7 @@ msgstr "Kod pocztowy"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "Kod pocztowy"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -802,7 +793,7 @@ msgstr "Wyświetlana nazwa"
msgid "Active"
msgstr "Aktywna"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Zapisz"
@@ -810,7 +801,7 @@ msgstr "Zapisz"
msgid "Submit"
msgstr "Potwierdź"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Anuluj"
@@ -834,29 +825,29 @@ msgstr "Nazwa nowej książki adresowej"
msgid "Importing contacts"
msgstr "importuj kontakty"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Dodaj kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfiguruj książkę adresową"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Wybierz książki adresowe"
#: templates/part.selectaddressbook.php:20
msgid "Enter name"
-msgstr ""
+msgstr "Wpisz nazwę"
#: templates/part.selectaddressbook.php:22
msgid "Enter description"
-msgstr ""
+msgstr "Wprowadź opis"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -874,6 +865,34 @@ msgstr "Pierwszy adres"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Pobiera książkę adresową"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edytuje książkę adresową"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nowa książka adresowa"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 5049bce7f64..ea413953c7f 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Styczeń"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b2dc4fe1f65..5d51eda986e 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 14:04+0000\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +66,7 @@ msgstr "Polski"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Ostrzeżenia bezpieczeństwa"
#: templates/admin.php:28
msgid "Log"
@@ -208,18 +208,14 @@ msgstr "Domyślny udział"
msgid "Other"
msgstr "Inne"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
#: templates/users.php:82
msgid "Quota"
msgstr "Udział"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Usuń"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 9f9833ac2d7..cce81b3b226 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Erro ao (des)ativar agenda."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Ocorreu um erro ao adicionar o contato."
@@ -32,7 +28,9 @@ msgstr "Ocorreu um erro ao adicionar o contato."
msgid "element name is not set."
msgstr "nome do elemento não definido."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID não definido."
@@ -56,6 +54,18 @@ msgstr "Tentando adiciona propriedade duplicada:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro ao (des)ativar agenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possível atualizar sua agenda com um nome em branco."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro ao atualizar agenda."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nenhum ID fornecido"
@@ -169,14 +179,6 @@ msgstr "Something went FUBAR. "
msgid "Error updating contact property."
msgstr "Erro ao atualizar propriedades do contato."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Não é possível atualizar sua agenda com um nome em branco."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erro ao atualizar agenda."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Erro enviando contatos para armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
msgid "Contacts"
msgstr "Contatos"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "não implementado"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Não foi possível obter um endereço válido."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contato"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Esta propriedade não pode estar vazia."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Não foi possível serializar elementos."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Editar nome"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Nenhum arquivo selecionado para carregar."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Selecione o tipo"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado:"
@@ -300,129 +309,133 @@ msgstr "importado,"
msgid " failed."
msgstr "falhou."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Lista de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Esta não é a sua agenda de endereços."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Contato não pôde ser encontrado."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Endereço"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefone"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organização"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Trabalho"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Home"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Móvel"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voz"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mensagem"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vídeo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Aniversário"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "Importar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Agendas de Endereço"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Fechar."
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Livro de Endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova agenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Excluir"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Arraste a foto para ser carregada"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Deletar imagem atual"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editar imagem atual"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Carregar nova foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Selecionar foto do OwnCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editar detalhes do nome"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Excluir"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Apelido"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Digite o apelido"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-aaaa"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupos"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separe grupos por virgula"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editar grupos"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Por favor, especifique um email válido."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Digite um endereço de email"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Correio para endereço"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Remover endereço de email"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Digite um número de telefone"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Remover número de telefone"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Visualizar no mapa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editar detalhes de endereço"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Adicionar notas"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Adicionar campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefone"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Baixar contato"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Apagar contato"
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
msgid "Active"
msgstr "Ativo"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Salvar"
@@ -809,7 +800,7 @@ msgstr "Salvar"
msgid "Submit"
msgstr "Enviar"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancelar"
@@ -833,15 +824,15 @@ msgstr "Nome da nova agenda de endereços"
msgid "Importing contacts"
msgstr "Importar contatos"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Voce não tem contatos em sua agenda de endereços."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Adicionar contatos"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configurar agenda de endereços"
@@ -873,6 +864,34 @@ msgstr "Endereço primário(Kontact et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova agenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 2e90ce266ff..bdf2c828c38 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Janeiro"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 7f26bc7340e..d190c95cebd 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Quota Padrão"
msgid "Other"
msgstr "Outro"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -214,10 +214,6 @@ msgstr ""
msgid "Quota"
msgstr "Cota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Apagar"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index c76d7bf6d2d..079871ab19d 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Erro a (des)ativar o livro de endereços"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Erro ao adicionar contato"
@@ -32,7 +28,9 @@ msgstr "Erro ao adicionar contato"
msgid "element name is not set."
msgstr "o nome do elemento não está definido."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id não está definido"
@@ -56,6 +54,18 @@ msgstr "A tentar adicionar propriedade duplicada: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro a (des)ativar o livro de endereços"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro a atualizar o livro de endereços"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nenhum ID inserido"
@@ -169,14 +179,6 @@ msgstr "Algo provocou um FUBAR. "
msgid "Error updating contact property."
msgstr "Erro ao atualizar propriedade do contato"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erro a atualizar o livro de endereços"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Erro a carregar os contactos para o armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
msgid "Contacts"
msgstr "Contactos"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Desculpe, esta funcionalidade ainda não está implementada"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Não implementado"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Não foi possível obter um endereço válido."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contacto"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Esta propriedade não pode estar vazia."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Não foi possivel serializar os elementos"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Editar nome"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Nenhum ficheiro seleccionado para enviar."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Seleccionar tipo"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -300,129 +309,133 @@ msgstr " importado, "
msgid " failed."
msgstr " falhou."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Livro de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Esta não é a sua lista de contactos"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "O contacto não foi encontrado"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Morada"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefone"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organização"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Emprego"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Casa"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Telemovel"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Texto"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voz"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mensagem"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Vídeo"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Aniversário"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "Importar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Livros de endereços"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Fechar"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar livros de endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novo livro de endereços"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Endereço CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Transferir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Apagar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Arraste e solte fotos para carregar"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Eliminar a foto actual"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Editar a foto actual"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Carregar nova foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Selecionar uma foto da ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Editar detalhes do nome"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Apagar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Alcunha"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Introduza alcunha"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-aaaa"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupos"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separe os grupos usando virgulas"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editar grupos"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Por favor indique um endereço de correio válido"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Introduza endereço de email"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Enviar correio para o endereço"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Eliminar o endereço de correio"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Insira o número de telefone"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Eliminar o número de telefone"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Ver no mapa"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Editar os detalhes do endereço"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Insira notas aqui."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Adicionar campo"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefone"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Nota"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Transferir contacto"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Apagar contato"
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
msgid "Active"
msgstr "Ativo"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Guardar"
@@ -809,7 +800,7 @@ msgstr "Guardar"
msgid "Submit"
msgstr "Submeter"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Cancelar"
@@ -833,15 +824,15 @@ msgstr "Nome do novo livro de endereços"
msgid "Importing contacts"
msgstr "A importar os contactos"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Não tem contactos no seu livro de endereços."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Adicionar contacto"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Configurar livros de endereços"
@@ -873,6 +864,34 @@ msgstr "Endereço primario (Kontact et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Transferir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novo livro de endereços"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 31d1426a475..18fae557ab6 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Definições"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Janeiro"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 4a6eac5818a..fbd1ad70ba6 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Quota por defeito"
msgid "Other"
msgstr "Outro"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Quota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Apagar"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0cff9f1cd58..6b883047de8 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(Dez)activarea agendei a întâmpinat o eroare."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "O eroare a împiedicat adăugarea contactului."
@@ -32,7 +28,9 @@ msgstr "O eroare a împiedicat adăugarea contactului."
msgid "element name is not set."
msgstr "numele elementului nu este stabilit."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID-ul nu este stabilit"
@@ -56,6 +54,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(Dez)activarea agendei a întâmpinat o eroare."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eroare la actualizarea agendei."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Nici un ID nu a fost furnizat"
@@ -169,14 +179,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Eroare la actualizarea proprietăților contactului."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eroare la actualizarea agendei."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -223,71 +225,78 @@ msgstr ""
msgid "Contacts"
msgstr "Contacte"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Contact"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Nu se găsește în agendă."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Contactul nu a putut fi găsit."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresă"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizație"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Servicu"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Acasă"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Text"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Voce"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Mesaj"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Zi de naștere"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Agende"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Agendă nouă"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Legătură CardDev"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descarcă"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editează"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Șterge"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Introdu detalii despre nume"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Șterge"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Pseudonim"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Introdu pseudonim"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "zz-ll-aaaa"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupuri"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separă grupurile cu virgule"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editează grupuri"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Preferat"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Te rog să specifici un e-mail corect"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Introdu adresa de e-mail"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Trimite mesaj la e-mail"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Șterge e-mail"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Descarcă acest contact"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Șterge contact"
@@ -801,7 +792,7 @@ msgstr "Nume afișat"
msgid "Active"
msgstr "Activ"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Salvează"
@@ -809,7 +800,7 @@ msgstr "Salvează"
msgid "Submit"
msgstr "Trimite"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Anulează"
@@ -833,15 +824,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -873,6 +864,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descarcă"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editează"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Agendă nouă"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index c718775f6e2..5a733b5eb1a 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
msgid "Settings"
msgstr "Configurări"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index f106c9706f9..64845e98ca5 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@ msgstr "Cotă implicită"
msgid "Other"
msgstr "Altele"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -213,10 +213,6 @@ msgstr ""
msgid "Quota"
msgstr "Cotă"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Șterge"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index a7988b19f42..d084087a97e 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -24,10 +24,6 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ошибка (де)активации адресной книги."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Произошла ошибка при добавлении контакта."
@@ -36,7 +32,9 @@ msgstr "Произошла ошибка при добавлении контак
msgid "element name is not set."
msgstr "имя элемента не установлено."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id не установлен."
@@ -60,6 +58,18 @@ msgstr "При попытке добавить дубликат:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ошибка (де)активации адресной книги."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Нельзя обновить адресную книгу с пустым именем."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Ошибка обновления адресной книги."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID не предоставлен"
@@ -173,14 +183,6 @@ msgstr "Что-то пошло FUBAR."
msgid "Error updating contact property."
msgstr "Ошибка обновления информации контакта."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Нельзя обновить адресную книгу с пустым именем."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Ошибка обновления адресной книги."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Ошибка загрузки контактов в хранилище."
@@ -227,71 +229,78 @@ msgstr "Файл не был загружен. Неизвестная ошибк
msgid "Contacts"
msgstr "Контакты"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "К сожалению, эта функция не была реализована"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Не реализовано"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Не удалось получить адрес."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ошибка"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Контакт"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Это свойство должно быть не пустым."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Не удалось сериализовать элементы."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Изменить имя"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Нет выбранных файлов для загрузки."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Выберите тип"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Результат:"
@@ -304,129 +313,133 @@ msgstr "импортировано, "
msgid " failed."
msgstr "не удалось."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресная книга не найдена."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Это не ваша адресная книга."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Контакт не найден."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Адрес"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Телефон"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Ящик эл. почты"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Организация"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Рабочий"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Домашний"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Мобильный"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Текст"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Голос"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Сообщение"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Факс"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Видео"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Пейджер"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Интернет"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "День рождения"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -446,207 +459,185 @@ msgstr "Импорт"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Адресные книги"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Закрыть"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Настроить Адресную книгу"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Новая адресная книга"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ссылка CardDAV"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Скачать"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Редактировать"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Перетяните фотографии для загрузки"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Удалить текущую фотографию"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Редактировать текущую фотографию"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Загрузить новую фотографию"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Выбрать фотографию из ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Формат Краткое имя, Полное имя"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Изменить детали имени"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Псевдоним"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Введите псевдоним"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Группы"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Разделить группы запятыми"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Редактировать группы"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Предпочитаемый"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Укажите действительный адрес электронной почты."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Укажите адрес электронной почты"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Написать по адресу"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Удалить адрес электронной почты"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Ввести номер телефона"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Удалить номер телефона"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Показать на карте"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Ввести детали адреса"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Добавьте заметки здесь."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Добавить поле"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Телефон"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Заметка"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Скачать контакт"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Удалить контакт"
@@ -805,7 +796,7 @@ msgstr "Отображаемое имя"
msgid "Active"
msgstr "Активно"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Сохранить"
@@ -813,7 +804,7 @@ msgstr "Сохранить"
msgid "Submit"
msgstr "Отправить"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Отменить"
@@ -837,15 +828,15 @@ msgstr "Имя новой адресной книги"
msgid "Importing contacts"
msgstr "Импорт контактов"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "В адресной книге нет контактов."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Добавить контакт"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Настроить адресную книгу"
@@ -877,6 +868,34 @@ msgstr "Первичный адрес (Kontact и др.)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Скачать"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Редактировать"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Новая адресная книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 997362d18fa..eb287d69881 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Январь"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e0e1293d2e1..9b23f80a3e1 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:15+0000\n"
-"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +208,7 @@ msgstr "Квота по умолчанию"
msgid "Other"
msgstr "Другое"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -216,10 +216,6 @@ msgstr ""
msgid "Quota"
msgstr "Квота"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Удалить"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d4ab54e819c..bd509c1c34d 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba (de)aktivácie adresára."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
@@ -32,7 +28,9 @@ msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
msgid "element name is not set."
msgstr "meno elementu nie je nastavené."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID nie je nastavené."
@@ -56,6 +54,18 @@ msgstr "Pokúšate sa pridať rovnaký atribút:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba (de)aktivácie adresára."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nedá sa upraviť adresár s prázdnym menom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba aktualizácie adresára."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID nezadané"
@@ -169,14 +179,6 @@ msgstr "Niečo sa pokazilo."
msgid "Error updating contact property."
msgstr "Chyba aktualizovania údaju kontaktu."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nedá sa upraviť adresár s prázdnym menom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Chyba aktualizácie adresára."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Chyba pri ukladaní kontaktov na úložisko."
@@ -223,71 +225,78 @@ msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
msgid "Contacts"
msgstr "Kontakty"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Neimplementované"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Nemôžem získať platnú adresu."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Nový"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Nový kontakt"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Tento parameter nemôže byť prázdny."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Nemôžem previesť prvky."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Upraviť meno"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Žiadne súbory neboli vybrané k nahratiu"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Vybrať typ"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Výsledok: "
@@ -300,129 +309,133 @@ msgstr " importovaných, "
msgid " failed."
msgstr " zlyhaných."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresár sa nenašiel."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Toto nie je váš adresár."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt nebol nájdený."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresa"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefón"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizácia"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Práca"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Domov"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "SMS"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Odkazová schránka"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Správa"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pager"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Narodeniny"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Biznis"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Klienti"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Prázdniny"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Stretnutie"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Iné"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Projekty"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Otázky"
@@ -442,207 +455,185 @@ msgstr "Importovať"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adresáre"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Zatvoriť"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Klávesové skratky"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Navigácia"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Ďalší kontakt v zozname"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Predchádzajúci kontakt v zozname"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Ďalší/predošlí adresár"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Akcie"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Obnov zoznam kontaktov"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Pridaj nový kontakt"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Pridaj nový adresár"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Vymaž súčasný kontakt"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastaviť adresáre"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresár"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stiahnuť"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Upraviť"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Odstrániť"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Pretiahnite sem fotku pre nahratie"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Odstrániť súčasnú fotku"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Upraviť súčasnú fotku"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Nahrať novú fotku"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Vybrať fotku z ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Upraviť podrobnosti mena"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Prezývka"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Zadajte prezývku"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd. mm. yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Skupiny"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Oddelte skupiny čiarkami"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Úprava skupín"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Uprednostňované"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Prosím zadajte platnú e-mailovú adresu."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Zadajte e-mailové adresy"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Odoslať na adresu"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Odstrániť e-mailové adresy"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Zadajte telefónne číslo"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Odstrániť telefónne číslo"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Zobraziť na mape"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Upraviť podrobnosti adresy"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Tu môžete pridať poznámky."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Pridať pole"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefón"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Poznámka"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Stiahnuť kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Odstrániť kontakt"
@@ -801,7 +792,7 @@ msgstr "Zobrazené meno"
msgid "Active"
msgstr "Aktívny"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Uložiť"
@@ -809,7 +800,7 @@ msgstr "Uložiť"
msgid "Submit"
msgstr "Odoslať"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Zrušiť"
@@ -833,15 +824,15 @@ msgstr "Meno nového adresára"
msgid "Importing contacts"
msgstr "Importovanie kontaktov"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Nemáte žiadne kontakty v adresári."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Pridať kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Nastaviť adresáre"
@@ -873,6 +864,34 @@ msgstr "Predvolená adresa (Kontakt etc)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Upraviť"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresár"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index cd00f6ca1f7..42eb5199757 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Január"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 38d8e42187e..086d0c86835 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "Predvolená kvóta"
msgid "Other"
msgstr "Iné"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -212,10 +212,6 @@ msgstr ""
msgid "Quota"
msgstr "Kvóta"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Odstrániť"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 6da58b6275f..60528db291a 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Napaka med (de)aktivacijo imenika."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Med dodajanjem stika je prišlo do napake"
@@ -32,7 +28,9 @@ msgstr "Med dodajanjem stika je prišlo do napake"
msgid "element name is not set."
msgstr "ime elementa ni nastavljeno."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id ni nastavljen."
@@ -56,6 +54,18 @@ msgstr "Poskušam dodati podvojeno lastnost:"
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Napaka med (de)aktivacijo imenika."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne morem posodobiti imenika s praznim imenom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Napaka pri posodabljanju imenika."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID ni bil podan"
@@ -169,14 +179,6 @@ msgstr "Nekaj je šlo v franže. "
msgid "Error updating contact property."
msgstr "Napaka pri posodabljanju lastnosti stika."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne morem posodobiti imenika s praznim imenom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Napaka pri posodabljanju imenika."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Napaka pri nalaganju stikov v hrambo."
@@ -223,71 +225,78 @@ msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
msgid "Contacts"
msgstr "Stiki"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Žal ta funkcionalnost še ni podprta"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Ni podprto"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Ne morem dobiti veljavnega naslova."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Napaka"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Stik"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Ta lastnost ne sme biti prazna"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Predmetov ni bilo mogoče dati v zaporedje."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate poročilo o napaki na bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Uredi ime"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Nobena datoteka ni bila izbrana za nalaganje."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Izberite vrsto"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Rezultati: "
@@ -300,129 +309,133 @@ msgstr " uvoženih, "
msgid " failed."
msgstr " je spodletelo."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Imenik ni bil najden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "To ni vaš imenik."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Stika ni bilo mogoče najti."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Naslov"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-pošta"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizacija"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Delo"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Doma"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobilni telefon"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Besedilo"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Glas"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Sporočilo"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pozivnik"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Rojstni dan"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "Uvozi"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Imeniki"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Zapri"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavi imenike"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nov imenik"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav povezava"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Prenesi"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Izbriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Spustite sliko tukaj, da bi jo naložili"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Izbriši trenutno sliko"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Uredi trenutno sliko"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Naloži novo sliko"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Izberi sliko iz ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Uredite podrobnosti imena"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Vzdevek"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Vnesite vzdevek"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd. mm. yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Skupine"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Skupine ločite z vejicami"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Uredi skupine"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Prednosten"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Prosimo, če navedete veljaven e-poštni naslov."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Vnesite e-poštni naslov"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "E-pošta naslovnika"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Izbriši e-poštni naslov"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Vpiši telefonsko številko"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Izbriši telefonsko številko"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Prikaz na zemljevidu"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Uredi podrobnosti"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Opombe dodajte tukaj."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Dodaj polje"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Opomba"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Prenesi stik"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Izbriši stik"
@@ -801,7 +792,7 @@ msgstr "Ime za prikaz"
msgid "Active"
msgstr "Aktiven"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Shrani"
@@ -809,7 +800,7 @@ msgstr "Shrani"
msgid "Submit"
msgstr "Potrdi"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Prekliči"
@@ -833,15 +824,15 @@ msgstr "Ime novega imenika"
msgid "Importing contacts"
msgstr "Uvažam stike"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "V vašem imeniku ni stikov."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Dodaj stik"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Nastavi imenike"
@@ -873,6 +864,34 @@ msgstr "Primarni naslov (za kontakt et al)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Prenesi"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nov imenik"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 4fc16e05df2..c3f2d15c367 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "januar"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 25758a95379..0b8d353a0c9 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:03+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Privzeta količinska omejitev"
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "PodSkrbnik"
@@ -212,10 +212,6 @@ msgstr "PodSkrbnik"
msgid "Quota"
msgstr "Količinska omejitev"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "PodSkrbnik za ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Izbriši"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index c96ce8db696..63337ab5cf1 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Language: so\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 03d2be49971..81021ac3e6d 100644
--- a/l10n/so/core.po
+++ b/l10n/so/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: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 4a50494e555..1d7081baad7 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index d526bdd6da8..2b4ced16c7a 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr "Контакти"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Контакт"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ово није ваш адресар."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Контакт се не може наћи."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Адреса"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Телефон"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Е-маил"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Организација"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Посао"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Кућа"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Мобилни"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Текст"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Глас"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Факс"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Видео"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Пејџер"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Рођендан"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Адресар"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нови адресар"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Преузимање"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Уреди"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Обриши"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Обриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Пожељан"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Телефон"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Преузми контакт"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Обриши контакт"
@@ -799,7 +790,7 @@ msgstr "Приказано име"
msgid "Active"
msgstr "Активан"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Сними"
@@ -807,7 +798,7 @@ msgstr "Сними"
msgid "Submit"
msgstr "Пошаљи"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Откажи"
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преузимање"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нови адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index f2a2095d888..58a7f8706ac 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "Подешавања"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index f9bdbc97536..3976e060afb 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Обриши"
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index f767552e5c8..116e2d372d6 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Ovo nije vaš adresar."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt se ne može naći."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adresa"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-mail"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizacija"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Posao"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Kuća"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobilni"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Tekst"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Glas"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Pejdžer"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Rođendan"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -799,7 +790,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -807,7 +798,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index fd21f716a1b..4577fbf12de 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 076b4a92d79..a4a177f7dbe 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Obriši"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index a786f05bf90..6269e183cfd 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fel när (av)aktivera adressbok"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Det uppstod ett fel när kontakt skulle läggas till"
@@ -34,7 +30,9 @@ msgstr "Det uppstod ett fel när kontakt skulle läggas till"
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ID är inte satt."
@@ -58,6 +56,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr "Kunde inte lägga till egenskap för kontakt:"
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fel när (av)aktivera adressbok"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan inte uppdatera adressboken med ett tomt namn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fel uppstod när adressbok skulle uppdateras"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Inget ID angett"
@@ -171,14 +181,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan inte uppdatera adressboken med ett tomt namn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fel uppstod när adressbok skulle uppdateras"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Fel uppstod när kontakt skulle lagras."
@@ -225,71 +227,78 @@ msgstr "Ingen fil uppladdad. Okänt fel"
msgid "Contacts"
msgstr "Kontakter"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Tyvärr är denna funktion inte införd än"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Inte införd"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Kunde inte hitta en giltig adress."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fel"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kontakt"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Ny"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Ny kontakt"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Denna egenskap får inte vara tom."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Kunde inte serialisera element."
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "Ändra namn"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Inga filer valda för uppladdning"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Välj typ"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr "importerad,"
msgid " failed."
msgstr "misslyckades."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Hittade inte adressboken"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Det här är inte din adressbok."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kontakt kunde inte hittas."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adress"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "E-post"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organisation"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Arbete"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Hem"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Text"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Röst"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "Meddelande"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Personsökare"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Födelsedag"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "Företag"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Ring"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Kunder"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Leverera"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Helgdagar"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Idéer"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -444,207 +457,185 @@ msgstr "Importera"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adressböcker"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Stäng"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurera adressböcker"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressbok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV länk"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Nedladdning"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redigera"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Radera"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Släpp foto för att ladda upp"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Ta bort aktuellt foto"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Redigera aktuellt foto"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Ladda upp ett nytt foto"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "Välj foto från ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "Redigera detaljer för namn"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Smeknamn"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Ange smeknamn"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-åååå"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Grupper"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Separera grupperna med kommatecken"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Editera grupper"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Föredragen"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Vänligen ange en giltig e-postadress"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Ange e-postadress"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Posta till adress."
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Ta bort e-postadress"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Ange ett telefonnummer"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Ta bort telefonnummer"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Visa på karta"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Redigera detaljer för adress"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Lägg till noteringar här."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Lägg till fält"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Notering"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Ladda ner kontakt"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Radera kontakt"
@@ -803,7 +794,7 @@ msgstr "Visningsnamn"
msgid "Active"
msgstr "Aktiv"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Spara"
@@ -811,7 +802,7 @@ msgstr "Spara"
msgid "Submit"
msgstr "Skicka in"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Avbryt"
@@ -835,15 +826,15 @@ msgstr "Namn för ny adressbok"
msgid "Importing contacts"
msgstr "Importerar kontakter"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Du har inga kontakter i din adressbok."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Lägg till en kontakt"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Konfigurera adressböcker"
@@ -875,6 +866,34 @@ msgstr "Primär adress (Kontakt o.a.)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Nedladdning"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redigera"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressbok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index e836e06af44..3017915cbb8 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Januari"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index a1a94b378f0..d9120851042 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 20:26+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +207,7 @@ msgstr "Förvald datakvot"
msgid "Other"
msgstr "Annat"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "Underadministratör"
@@ -215,10 +215,6 @@ msgstr "Underadministratör"
msgid "Quota"
msgstr "Kvot"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Underadministratör för ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Ta bort"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 7670957eb30..e89c3013f23 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 268728145d5..7f5c94e340f 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index a1b58e56064..eb813eae169 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -29,7 +25,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -53,6 +51,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -220,71 +222,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at bugs."
"owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr ""
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr ""
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr ""
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr ""
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr ""
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr ""
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr ""
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr ""
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -439,207 +452,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr ""
@@ -798,7 +789,7 @@ msgstr ""
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -806,7 +797,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -830,15 +821,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -870,6 +861,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f0db3549bf3..d07f4a40df5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,10 +37,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 315360d0d24..aba904c9b0f 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 8af0f4a2da6..a46ccf931af 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f4b8daced52..7d736804186 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 89839423195..896a797b89f 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d6ae07cf20c..f72352b36de 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -201,7 +201,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -209,10 +209,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr ""
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index fbaf36dfc91..eb2c9979957 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
@@ -31,7 +27,9 @@ msgstr "เกิดข้อผิดพลาดในการเพิ่ม
msgid "element name is not set."
msgstr "ยังไม่ได้กำหนดชื่อ"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "ยังไม่ได้กำหนดรหัส"
@@ -55,6 +53,18 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ยังไม่ได้ใส่รหัส"
@@ -168,14 +178,6 @@ msgstr "มีบางอย่างเกิดการ FUBAR. "
msgid "Error updating contact property."
msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
@@ -222,71 +224,78 @@ msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโ
msgid "Contacts"
msgstr "ข้อมูลการติดต่อ"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "ยังไม่ได้ถูกดำเนินการ"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "พบข้อผิดพลาด"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "ข้อมูลการติดต่อ"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "แก้ไขชื่อ"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "เลือกชนิด"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "ผลลัพธ์: "
@@ -299,129 +308,133 @@ msgstr " นำเข้าข้อมูลแล้ว, "
msgid " failed."
msgstr " ล้มเหลว."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "ไม่พบข้อมูลการติดต่อ"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "ที่อยู่"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "โทรศัพท์"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "อีเมล์"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "หน่วยงาน"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "ที่ทำงาน"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "บ้าน"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "มือถือ"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "ข้อความ"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "เสียงพูด"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "ข้อความ"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "โทรสาร"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "วีดีโอ"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "เพจเจอร์"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "อินเทอร์เน็ต"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "วันเกิด"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr "นำเข้า"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "สมุดบันทึกที่อยู่"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "ปิด"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "ลิงค์ CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "ดาวน์โหลด"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "แก้ไข"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "ลบ"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "วางรูปภาพที่ต้องการอัพโหลด"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "ลบรูปภาพปัจจุบัน"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "แก้ไขรูปภาพปัจจุบัน"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "อัพโหลดรูปภาพใหม่"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "เลือกรูปภาพจาก ownCloud"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "แก้ไขรายละเอียดของชื่อ"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "ชื่อเล่น"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "กรอกชื่อเล่น"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "กลุ่ม"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "แก้ไขกลุ่ม"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "พิเศษ"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "กรอกที่อยู่อีเมล"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "ส่งอีเมลไปที่"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "ลบที่อยู่อีเมล"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "กรอกหมายเลขโทรศัพท์"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "ลบหมายเลขโทรศัพท์"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "ดูบนแผนที่"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "แก้ไขรายละเอียดที่อยู่"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "เพิ่มช่องรับข้อมูล"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "โทรศัพท์"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "หมายเหตุ"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "ลบข้อมูลการติดต่อ"
@@ -800,7 +791,7 @@ msgstr "ชื่อที่ต้องการให้แสดง"
msgid "Active"
msgstr "เปิดใช้"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "บันทึก"
@@ -808,7 +799,7 @@ msgstr "บันทึก"
msgid "Submit"
msgstr "ส่งข้อมูล"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "ยกเลิก"
@@ -832,15 +823,15 @@ msgstr "กำหนดชื่อของสมุดที่อยู่ท
msgid "Importing contacts"
msgstr "นำเข้าข้อมูลการติดต่อ"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "เพิ่มชื่อผู้ติดต่อ"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
@@ -872,6 +863,34 @@ msgstr "ที่อยู่หลัก (สำหรับติดต่อ)
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 229c9588793..4a078f83302 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "มกราคม"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 33c12981c45..df4bad317ac 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "โควต้าที่กำหนดไว้เริ่มต้
msgid "Other"
msgstr "อื่นๆ"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -212,10 +212,6 @@ msgstr ""
msgid "Quota"
msgstr "พื้นที่"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "ลบ"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 041e00bf18b..821e951cc51 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Adres defteri etkisizleştirilirken hata oluştu."
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "Kişi eklenirken hata oluştu."
@@ -32,7 +28,9 @@ msgstr "Kişi eklenirken hata oluştu."
msgid "element name is not set."
msgstr "eleman ismi atanmamış."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id atanmamış."
@@ -56,6 +54,18 @@ msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
msgid "Error adding contact property: "
msgstr "Kişi özelliği eklenirken hata oluştu."
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Adres defteri etkisizleştirilirken hata oluştu."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adres defteri güncellenirken hata oluştu."
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "ID verilmedi"
@@ -169,14 +179,6 @@ msgstr "Bir şey FUBAR gitti."
msgid "Error updating contact property."
msgstr "Kişi özelliği güncellenirken hata oluştu."
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adres defteri güncellenirken hata oluştu."
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Bağlantıları depoya yükleme hatası"
@@ -223,71 +225,78 @@ msgstr "Dosya yüklenmedi. Bilinmeyen hata"
msgid "Contacts"
msgstr "Kişiler"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "Tamamlanmadı."
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "Geçerli bir adres alınamadı."
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hata"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Kişi"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr "Yeni"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr "Yeni Kişi"
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "Bu özellik boş bırakılmamalı."
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "Öğeler seri hale getiremedi"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "İsmi düzenle"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "Yükleme için dosya seçilmedi."
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "Tür seç"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Sonuç: "
@@ -300,129 +309,133 @@ msgstr " içe aktarıldı, "
msgid " failed."
msgstr " hatalı."
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adres defteri bulunamadı."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Bu sizin adres defteriniz değil."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "Kişi bulunamadı."
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Adres"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Eposta"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Organizasyon"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "İş"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Ev"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Mobil"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Metin"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Ses"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "mesaj"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Faks"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Sayfalayıcı"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "İnternet"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Doğum günü"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr "İş"
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr "Çağrı"
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr "Müşteriler"
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr "Dağıtıcı"
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr "Tatiller"
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr "Fikirler"
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr "Seyahat"
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr "Yıl Dönümü"
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr "Toplantı"
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr "Diğer"
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr "Kişisel"
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr "Projeler"
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr "Sorular"
@@ -442,207 +455,185 @@ msgstr "İçe aktar"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Adres defterleri"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "Kapat"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr "Klavye kısayolları"
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr "Dolaşım"
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr "Listedeki sonraki kişi"
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr "Listedeki önceki kişi"
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr "Şuanki adres defterini genişlet/daralt"
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr "Sonraki/Önceki adres defteri"
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr "Eylemler"
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr "Kişi listesini tazele"
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr "Yeni kişi ekle"
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr "Yeni adres defteri ekle"
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr "Şuanki kişiyi sil"
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adres Defterlerini Yapılandır"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Yeni Adres Defteri"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Bağlantısı"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "İndir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Düzenle"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Sil"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "Fotoğrafı yüklenmesi için bırakın"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "Mevcut fotoğrafı sil"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "Mevcut fotoğrafı düzenle"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "Yeni fotoğraf yükle"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "ownCloud'dan bir fotoğraf seç"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "İsim detaylarını düzenle"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "Takma ad"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "Takma adı girin"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr "Web sitesi"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr "Web sitesine git"
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "gg-aa-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "Gruplar"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "Grupları birbirinden virgülle ayırın"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "Grupları düzenle"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "Tercih edilen"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "Lütfen geçerli bir eposta adresi belirtin."
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "Eposta adresini girin"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "Eposta adresi"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "Eposta adresini sil"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "Telefon numarasını gir"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "Telefon numarasını sil"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "Haritada gör"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "Adres detaylarını düzenle"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "Notları buraya ekleyin."
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "Alan ekle"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "Not"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "Kişiyi indir"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Kişiyi sil"
@@ -801,7 +792,7 @@ msgstr "Görünen adı"
msgid "Active"
msgstr "Aktif"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Kaydet"
@@ -809,7 +800,7 @@ msgstr "Kaydet"
msgid "Submit"
msgstr "Gönder"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "İptal"
@@ -833,15 +824,15 @@ msgstr "Yeni adres defteri için isim"
msgid "Importing contacts"
msgstr "Bağlantıları içe aktar"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "Adres defterinizde hiç bağlantı yok."
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "Bağlatı ekle"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "Adres defterini yapılandır"
@@ -873,6 +864,34 @@ msgstr "Birincil adres (Bağlantı ve arkadaşları)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Sadece okunabilir vCard dizin link(ler)i"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "İndir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Düzenle"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Yeni Adres Defteri"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 4f27a0126c6..06136c97ff9 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Ocak"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 66a8b77b9c7..2ac944dd68c 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:13+0000\n"
-"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Varsayılan Kota"
msgid "Other"
msgstr "Diğer"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr "Alt Yönetici"
@@ -212,10 +212,6 @@ msgstr "Alt Yönetici"
msgid "Quota"
msgstr "Kota"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Alt yönetici için ..."
-
#: templates/users.php:145
msgid "Delete"
msgstr "Sil"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 19ad51b5968..7cdc0357d4e 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "Це не ваша адресна книга."
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Адреса"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Телефон"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Ел.пошта"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Організація"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr ""
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr ""
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Мобільний"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "Текст"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "Голос"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Факс"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Відео"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "Пейджер"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "День народження"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr ""
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Нова адресна книга"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Завантажити"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr ""
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Видалити"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Видалити"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Телефон"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Видалити контакт"
@@ -799,7 +790,7 @@ msgstr "Відображуване ім'я"
msgid "Active"
msgstr ""
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr ""
@@ -807,7 +798,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr ""
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Завантажити"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нова адресна книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index d0c31b79d53..731e7d912ef 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 134236723a8..e2406d8e54b 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 21:39+0000\n"
-"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -202,7 +202,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr ""
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Видалити"
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 5451d950699..dab1d3502e8 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
msgid "element name is not set."
msgstr "tên phần tử không được thiết lập."
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "id không được thiết lập."
@@ -54,6 +52,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "Không có ID được cung cấp"
@@ -167,14 +177,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr ""
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr ""
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
@@ -221,71 +223,78 @@ msgstr ""
msgid "Contacts"
msgstr "Liên lạc"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "Danh sách"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
msgstr ""
-#: lib/app.php:46
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr ""
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "Địa chỉ"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "Điện thoại bàn"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "Email"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "Tổ chức"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "Công việc"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "Nhà"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "Di động"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr ""
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr ""
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr ""
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "Fax"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "Video"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "số trang"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr ""
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "Ngày sinh nhật"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -440,207 +453,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "Sổ địa chỉ"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Tải về"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sửa"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "Xóa"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "Điện thoại"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr ""
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "Xóa liên lạc"
@@ -799,7 +790,7 @@ msgstr "Hiển thị tên"
msgid "Active"
msgstr "Kích hoạt"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "Lưu"
@@ -807,7 +798,7 @@ msgstr "Lưu"
msgid "Submit"
msgstr "Submit"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "Hủy"
@@ -831,15 +822,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -871,6 +862,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sửa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 60bed8f0dcf..29ceebc712b 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "Tháng 1"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index ab283334671..55b0485ddf3 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Hạn ngạch mặt định"
msgid "Other"
msgstr "Khác"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -211,10 +211,6 @@ msgstr ""
msgid "Quota"
msgstr "Hạn ngạch"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "Xóa"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 577dc470d47..c66057c0cb9 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(取消)激活地址簿错误。"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "添加联系人时出错。"
@@ -32,7 +28,9 @@ msgstr "添加联系人时出错。"
msgid "element name is not set."
msgstr "元素名称未设置"
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr "没有设置 id。"
@@ -56,6 +54,18 @@ msgstr "试图添加重复属性: "
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(取消)激活地址簿错误。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "无法使用一个空名称更新地址簿"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "更新地址簿错误"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "未提供 ID"
@@ -169,14 +179,6 @@ msgstr "有一些信息无法被处理。"
msgid "Error updating contact property."
msgstr "更新联系人属性错误。"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "无法使用一个空名称更新地址簿"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "更新地址簿错误"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr "上传联系人到存储空间时出错"
@@ -223,71 +225,78 @@ msgstr "没有文件被上传。未知错误"
msgid "Contacts"
msgstr "联系人"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr "抱歉,这个功能暂时还没有被实现"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr "未实现"
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr "无法获取一个合法的地址。"
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "错误"
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "联系人"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr "这个属性必须是非空的"
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr "无法序列化元素"
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr "编辑名称"
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr "没有选择文件以上传"
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您试图上传的文件超出了该服务器的最大文件限制"
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr "选择类型"
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "结果: "
@@ -300,129 +309,133 @@ msgstr " 已导入, "
msgid " failed."
msgstr " 失败。"
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "未找到地址簿。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "这不是您的地址簿。"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "无法找到联系人。"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "地址"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "电话"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "电子邮件"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "组织"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "工作"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "家庭"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "移动电话"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "文本"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "语音"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "消息"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "传真"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "视频"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "传呼机"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "互联网"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "生日"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -442,207 +455,185 @@ msgstr "导入"
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "地址簿"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr "关闭"
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "配置地址簿"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新建地址簿"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 链接"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "下载"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "编辑"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "删除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr "拖拽图片进行上传"
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr "删除当前照片"
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr "编辑当前照片"
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr "上传新照片"
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr "从 ownCloud 选择照片"
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "自定义格式,简称,全名,姓在前,姓在前并用逗号分割"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "编辑名称详情"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "昵称"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "输入昵称"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "yyyy-mm-dd"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "分组"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "用逗号隔开分组"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "编辑分组"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "偏好"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "请指定合法的电子邮件地址"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "输入电子邮件地址"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "发送邮件到地址"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "删除电子邮件地址"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "输入电话号码"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "删除电话号码"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr "在地图上显示"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "编辑地址细节。"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "添加注释。"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "添加字段"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "电话"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "注释"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "下载联系人"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "删除联系人"
@@ -801,7 +792,7 @@ msgstr "显示名称"
msgid "Active"
msgstr "激活"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "保存"
@@ -809,7 +800,7 @@ msgstr "保存"
msgid "Submit"
msgstr "提交"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "取消"
@@ -833,15 +824,15 @@ msgstr "新地址簿名称"
msgid "Importing contacts"
msgstr "导入联系人"
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr "您的地址簿中没有联系人。"
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr "添加联系人"
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr "配置地址簿"
@@ -873,6 +864,34 @@ msgstr "首选地址 (Kontact 等)"
msgid "iOS/OS X"
msgstr "iOS/OS X"
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下载"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新建地址簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index f9babe102eb..bc2b2800877 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
msgid "Settings"
msgstr "设置"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr "一月"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8af92221055..cb16e2cbf86 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -204,7 +204,7 @@ msgstr "默认配额"
msgid "Other"
msgstr "其它"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -212,10 +212,6 @@ msgstr ""
msgid "Quota"
msgstr "配额"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "删除"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index db0b2a0c0fa..dac86b63c63 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "在啟用或關閉電話簿時發生錯誤"
-
#: ajax/addcontact.php:47
msgid "There was an error adding the contact."
msgstr "添加通訊錄發生錯誤"
@@ -31,7 +27,9 @@ msgstr "添加通訊錄發生錯誤"
msgid "element name is not set."
msgstr ""
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
msgid "id is not set."
msgstr ""
@@ -55,6 +53,18 @@ msgstr ""
msgid "Error adding contact property: "
msgstr ""
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "在啟用或關閉電話簿時發生錯誤"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "電話簿更新中發生錯誤"
+
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
msgstr "未提供 ID"
@@ -168,14 +178,6 @@ msgstr ""
msgid "Error updating contact property."
msgstr "更新通訊錄內容中發生錯誤"
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "電話簿更新中發生錯誤"
-
#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
msgid "Error uploading contacts to storage."
msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
msgid "Contacts"
msgstr "通訊錄"
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Sorry, this functionality has not been implemented yet"
msgstr ""
-#: js/contacts.js:64
+#: js/contacts.js:72
msgid "Not implemented"
msgstr ""
-#: js/contacts.js:69
+#: js/contacts.js:77
msgid "Couldn't get a valid address."
msgstr ""
-#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
-#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
-#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
-#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
-#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1570
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
msgid "Contact"
msgstr "通訊錄"
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New"
msgstr ""
-#: js/contacts.js:400
+#: js/contacts.js:408
msgid "New Contact"
msgstr ""
-#: js/contacts.js:715
+#: js/contacts.js:723
msgid "This property has to be non-empty."
msgstr ""
-#: js/contacts.js:741
+#: js/contacts.js:749
msgid "Couldn't serialize elements."
msgstr ""
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
msgid ""
"'deleteProperty' called without type argument. Please report at "
"bugs.owncloud.org"
msgstr ""
-#: js/contacts.js:884
+#: js/contacts.js:892
msgid "Edit name"
msgstr ""
-#: js/contacts.js:1165
+#: js/contacts.js:1173
msgid "No files selected for upload."
msgstr ""
-#: js/contacts.js:1173
+#: js/contacts.js:1181
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
msgid "Select type"
msgstr ""
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
msgid " failed."
msgstr ""
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "找不到通訊錄"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
msgid "This is not your addressbook."
msgstr "這不是你的電話簿"
-#: lib/app.php:65
+#: lib/app.php:68
msgid "Contact could not be found."
msgstr "通訊錄未發現"
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
msgid "Address"
msgstr "地址"
-#: lib/app.php:110
+#: lib/app.php:113
msgid "Telephone"
msgstr "電話"
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
msgid "Email"
msgstr "電子郵件"
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
msgid "Organization"
msgstr "組織"
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
msgid "Work"
msgstr "公司"
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
msgid "Home"
msgstr "住宅"
-#: lib/app.php:130
+#: lib/app.php:133
msgid "Mobile"
msgstr "行動電話"
-#: lib/app.php:132
+#: lib/app.php:135
msgid "Text"
msgstr "文字"
-#: lib/app.php:133
+#: lib/app.php:136
msgid "Voice"
msgstr "語音"
-#: lib/app.php:134
+#: lib/app.php:137
msgid "Message"
msgstr "訊息"
-#: lib/app.php:135
+#: lib/app.php:138
msgid "Fax"
msgstr "傳真"
-#: lib/app.php:136
+#: lib/app.php:139
msgid "Video"
msgstr "影片"
-#: lib/app.php:137
+#: lib/app.php:140
msgid "Pager"
msgstr "呼叫器"
-#: lib/app.php:143
+#: lib/app.php:146
msgid "Internet"
msgstr "網際網路"
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
msgid "Birthday"
msgstr "生日"
-#: lib/app.php:181
+#: lib/app.php:184
msgid "Business"
msgstr ""
-#: lib/app.php:182
+#: lib/app.php:185
msgid "Call"
msgstr ""
-#: lib/app.php:183
+#: lib/app.php:186
msgid "Clients"
msgstr ""
-#: lib/app.php:184
+#: lib/app.php:187
msgid "Deliverer"
msgstr ""
-#: lib/app.php:185
+#: lib/app.php:188
msgid "Holidays"
msgstr ""
-#: lib/app.php:186
+#: lib/app.php:189
msgid "Ideas"
msgstr ""
-#: lib/app.php:187
+#: lib/app.php:190
msgid "Journey"
msgstr ""
-#: lib/app.php:188
+#: lib/app.php:191
msgid "Jubilee"
msgstr ""
-#: lib/app.php:189
+#: lib/app.php:192
msgid "Meeting"
msgstr ""
-#: lib/app.php:190
+#: lib/app.php:193
msgid "Other"
msgstr ""
-#: lib/app.php:191
+#: lib/app.php:194
msgid "Personal"
msgstr ""
-#: lib/app.php:192
+#: lib/app.php:195
msgid "Projects"
msgstr ""
-#: lib/app.php:193
+#: lib/app.php:196
msgid "Questions"
msgstr ""
@@ -441,207 +454,185 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
msgstr "電話簿"
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
msgid "Close"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:39
msgid "Keyboard shortcuts"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Navigation"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:44
msgid "Next contact in list"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:46
msgid "Previous contact in list"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:48
msgid "Expand/collapse current addressbook"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:50
msgid "Next/previous addressbook"
msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "Actions"
msgstr ""
-#: templates/index.php:58
+#: templates/index.php:57
msgid "Refresh contacts list"
msgstr ""
-#: templates/index.php:60
+#: templates/index.php:59
msgid "Add new contact"
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Add new addressbook"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:63
msgid "Delete current contact"
msgstr ""
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "設定通訊錄"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新電話簿"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav 聯結"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "下載"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "編輯"
-
-#: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:39 templates/part.contact.php:41
-#: templates/part.contact.php:43 templates/part.contact.php:45
-#: templates/part.contact.php:49
-msgid "Delete"
-msgstr "刪除"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
msgid "Drop photo to upload"
msgstr ""
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
msgid "Delete current photo"
msgstr ""
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
msgid "Edit current photo"
msgstr ""
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
msgid "Upload new photo"
msgstr ""
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
msgid "Edit name details"
msgstr "編輯姓名詳細資訊"
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "刪除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
msgid "Nickname"
msgstr "綽號"
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
msgid "Enter nickname"
msgstr "輸入綽號"
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
msgid "Groups"
msgstr "群組"
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
msgid "Separate groups with commas"
msgstr "用逗號分隔群組"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
msgid "Edit groups"
msgstr "編輯群組"
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
msgid "Preferred"
msgstr "首選"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Please specify a valid email address."
msgstr "註填入合法的電子郵件住址"
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
msgid "Enter email address"
msgstr "輸入電子郵件地址"
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
msgid "Mail to address"
msgstr "寄送住址"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
msgid "Delete email address"
msgstr "刪除電子郵件住址"
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
msgid "Enter phone number"
msgstr "輸入電話號碼"
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
msgid "Delete phone number"
msgstr "刪除電話號碼"
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
msgid "Edit address details"
msgstr "電子郵件住址詳細資訊"
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
msgid "Add notes here."
msgstr "在這裡新增註解"
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
msgid "Add field"
msgstr "新增欄位"
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
msgid "Phone"
msgstr "電話"
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
msgid "Note"
msgstr "註解"
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
msgid "Download contact"
msgstr "下載通訊錄"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
msgid "Delete contact"
msgstr "刪除通訊錄"
@@ -800,7 +791,7 @@ msgstr "顯示名稱"
msgid "Active"
msgstr "作用中"
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
msgid "Save"
msgstr "儲存"
@@ -808,7 +799,7 @@ msgstr "儲存"
msgid "Submit"
msgstr "提出"
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
msgid "Cancel"
msgstr "取消"
@@ -832,15 +823,15 @@ msgstr ""
msgid "Importing contacts"
msgstr ""
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
msgstr ""
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
msgid "Add contact"
msgstr ""
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
msgid "Configure addressbooks"
msgstr ""
@@ -872,6 +863,34 @@ msgstr ""
msgid "iOS/OS X"
msgstr ""
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下載"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編輯"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新電話簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 9cc98c4b811..932959583c3 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
msgid "Settings"
msgstr "設定"
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
#: js/js.js:573
msgid "January"
msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 5e9690d52b6..2a5571a381c 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+0000\n"
"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "預設容量限制"
msgid "Other"
msgstr "其他"
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
msgstr ""
@@ -210,10 +210,6 @@ msgstr ""
msgid "Quota"
msgstr "容量限制"
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
#: templates/users.php:145
msgid "Delete"
msgstr "刪除"