summaryrefslogtreecommitdiffstats
path: root/l10n
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2012-08-16 02:09:15 +0200
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2012-08-16 02:09:15 +0200
commit1e6dc6751700a91faff463f8f2840cf24e742f37 (patch)
tree07a4cfaa8a508fd6594fdc421778766d5ee4a59a /l10n
parent4c638f101e09cbe43a2114c64ebb30774bafce4b (diff)
downloadnextcloud-server-1e6dc6751700a91faff463f8f2840cf24e742f37.tar.gz
nextcloud-server-1e6dc6751700a91faff463f8f2840cf24e742f37.zip
[tx-robot] updated from transifex
Diffstat (limited to 'l10n')
-rw-r--r--l10n/af/contacts.po18
-rw-r--r--l10n/ar/contacts.po18
-rw-r--r--l10n/ar_SA/contacts.po18
-rw-r--r--l10n/bg_BG/contacts.po18
-rw-r--r--l10n/ca/contacts.po18
-rw-r--r--l10n/cs_CZ/admin_migrate.po13
-rw-r--r--l10n/cs_CZ/bookmarks.po27
-rw-r--r--l10n/cs_CZ/calendar.po90
-rw-r--r--l10n/cs_CZ/contacts.po112
-rw-r--r--l10n/cs_CZ/files.po34
-rw-r--r--l10n/cs_CZ/files_encryption.po15
-rw-r--r--l10n/cs_CZ/files_sharing.po25
-rw-r--r--l10n/cs_CZ/files_versions.po11
-rw-r--r--l10n/cs_CZ/gallery.po84
-rw-r--r--l10n/cs_CZ/lib.po65
-rw-r--r--l10n/cs_CZ/settings.po24
-rw-r--r--l10n/cs_CZ/user_migrate.po23
-rw-r--r--l10n/cs_CZ/user_openid.po25
-rw-r--r--l10n/da/contacts.po18
-rw-r--r--l10n/de/contacts.po14
-rw-r--r--l10n/el/contacts.po33
-rw-r--r--l10n/eo/admin_dependencies_chk.po31
-rw-r--r--l10n/eo/admin_migrate.po13
-rw-r--r--l10n/eo/contacts.po18
-rw-r--r--l10n/eo/files_encryption.po15
-rw-r--r--l10n/eo/files_external.po39
-rw-r--r--l10n/eo/files_sharing.po25
-rw-r--r--l10n/eo/files_versions.po11
-rw-r--r--l10n/eo/tasks.po43
-rw-r--r--l10n/eo/user_ldap.po59
-rw-r--r--l10n/eo/user_migrate.po23
-rw-r--r--l10n/eo/user_openid.po25
-rw-r--r--l10n/es/contacts.po18
-rw-r--r--l10n/et_EE/contacts.po18
-rw-r--r--l10n/eu/contacts.po18
-rw-r--r--l10n/eu_ES/contacts.po18
-rw-r--r--l10n/fa/contacts.po18
-rw-r--r--l10n/fi/contacts.po18
-rw-r--r--l10n/fi_FI/contacts.po18
-rw-r--r--l10n/fr/contacts.po20
-rw-r--r--l10n/gl/contacts.po18
-rw-r--r--l10n/he/contacts.po18
-rw-r--r--l10n/hr/contacts.po18
-rw-r--r--l10n/hu_HU/contacts.po18
-rw-r--r--l10n/hy/contacts.po18
-rw-r--r--l10n/ia/contacts.po18
-rw-r--r--l10n/id/contacts.po18
-rw-r--r--l10n/id_ID/contacts.po18
-rw-r--r--l10n/it/contacts.po18
-rw-r--r--l10n/it/files_sharing.po8
-rw-r--r--l10n/it/tasks.po10
-rw-r--r--l10n/ja_JP/admin_dependencies_chk.po31
-rw-r--r--l10n/ja_JP/admin_migrate.po13
-rw-r--r--l10n/ja_JP/calendar.po21
-rw-r--r--l10n/ja_JP/contacts.po27
-rw-r--r--l10n/ja_JP/files_encryption.po15
-rw-r--r--l10n/ja_JP/files_external.po39
-rw-r--r--l10n/ja_JP/files_sharing.po26
-rw-r--r--l10n/ja_JP/files_versions.po11
-rw-r--r--l10n/ja_JP/settings.po15
-rw-r--r--l10n/ja_JP/tasks.po52
-rw-r--r--l10n/ja_JP/user_ldap.po76
-rw-r--r--l10n/ja_JP/user_migrate.po23
-rw-r--r--l10n/ja_JP/user_openid.po25
-rw-r--r--l10n/ko/contacts.po18
-rw-r--r--l10n/lb/contacts.po18
-rw-r--r--l10n/lt_LT/contacts.po18
-rw-r--r--l10n/lv/contacts.po18
-rw-r--r--l10n/mk/contacts.po18
-rw-r--r--l10n/ms_MY/contacts.po18
-rw-r--r--l10n/nb_NO/contacts.po18
-rw-r--r--l10n/nl/contacts.po18
-rw-r--r--l10n/nn_NO/contacts.po18
-rw-r--r--l10n/pl/contacts.po18
-rw-r--r--l10n/pt_BR/contacts.po18
-rw-r--r--l10n/pt_PT/contacts.po18
-rw-r--r--l10n/ro/contacts.po18
-rw-r--r--l10n/ru/contacts.po18
-rw-r--r--l10n/sk_SK/contacts.po18
-rw-r--r--l10n/sl/admin_dependencies_chk.po13
-rw-r--r--l10n/sl/admin_migrate.po13
-rw-r--r--l10n/sl/calendar.po90
-rw-r--r--l10n/sl/contacts.po112
-rw-r--r--l10n/sl/files_encryption.po15
-rw-r--r--l10n/sl/files_external.po24
-rw-r--r--l10n/sl/files_versions.po11
-rw-r--r--l10n/sl/lib.po22
-rw-r--r--l10n/sl/tasks.po12
-rw-r--r--l10n/sl/user_ldap.po31
-rw-r--r--l10n/sl/user_openid.po12
-rw-r--r--l10n/so/contacts.po18
-rw-r--r--l10n/sr/contacts.po18
-rw-r--r--l10n/sr@latin/contacts.po18
-rw-r--r--l10n/sv/contacts.po22
-rw-r--r--l10n/templates/admin_dependencies_chk.pot2
-rw-r--r--l10n/templates/admin_migrate.pot2
-rw-r--r--l10n/templates/bookmarks.pot2
-rw-r--r--l10n/templates/calendar.pot2
-rw-r--r--l10n/templates/contacts.pot10
-rw-r--r--l10n/templates/core.pot2
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.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.pot2
-rw-r--r--l10n/templates/tasks.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_migrate.pot2
-rw-r--r--l10n/templates/user_openid.pot2
-rw-r--r--l10n/th_TH/contacts.po14
-rw-r--r--l10n/tr/contacts.po18
-rw-r--r--l10n/uk/contacts.po18
-rw-r--r--l10n/vi/contacts.po18
-rw-r--r--l10n/zh_CN.GB2312/contacts.po18
-rw-r--r--l10n/zh_CN/contacts.po18
-rw-r--r--l10n/zh_TW/contacts.po18
120 files changed, 1391 insertions, 1183 deletions
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 052edbcaa4e..25b3d8aadcf 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2b79ab09cce..b026dc02301 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index b9c9e90a503..93e98852841 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index c76da91d867..5cfc246c8af 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 4db2c47811c..e7a004a081c 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 11:14+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -241,8 +241,8 @@ msgstr "No s'ha pogut obtenir una adreça vàlida."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Error"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -811,11 +815,11 @@ msgstr "Configura les llibretes d'adreces"
msgid "Select Address Books"
msgstr "Selecccioneu llibretes d'adreces"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Escriviu un nom"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Escriviu una descripció"
diff --git a/l10n/cs_CZ/admin_migrate.po b/l10n/cs_CZ/admin_migrate.po
index c24913e0709..a43f6e5be06 100644
--- a/l10n/cs_CZ/admin_migrate.po
+++ b/l10n/cs_CZ/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:35+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Export této instance ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Export"
diff --git a/l10n/cs_CZ/bookmarks.po b/l10n/cs_CZ/bookmarks.po
index 74239f80fa7..a6d7d19a244 100644
--- a/l10n/cs_CZ/bookmarks.po
+++ b/l10n/cs_CZ/bookmarks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
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 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:44+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
#: appinfo/app.php:14
msgid "Bookmarks"
-msgstr ""
+msgstr "Záložky"
#: bookmarksHelper.php:99
msgid "unnamed"
-msgstr ""
+msgstr "nepojmenovaný"
#: templates/bookmarklet.php:5
msgid ""
"Drag this to your browser bookmarks and click it, when you want to bookmark "
"a webpage quickly:"
-msgstr ""
+msgstr "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:"
#: templates/bookmarklet.php:7
msgid "Read later"
-msgstr ""
+msgstr "Přečíst později"
#: templates/list.php:13
msgid "Address"
-msgstr ""
+msgstr "Adresa"
#: templates/list.php:14
msgid "Title"
-msgstr ""
+msgstr "Název"
#: templates/list.php:15
msgid "Tags"
-msgstr ""
+msgstr "Tagy"
#: templates/list.php:16
msgid "Save bookmark"
-msgstr ""
+msgstr "Uložit záložku"
#: templates/list.php:22
msgid "You have no bookmarks"
-msgstr ""
+msgstr "Nemáte žádné záložky"
#: templates/settings.php:11
msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Záložky <br />"
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 0d3b9869286..f06317221c0 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:41+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
#: ajax/cache/status.php:19
msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "V paměti nejsou uloženy kompletně všechny kalendáře"
#: ajax/cache/status.php:21
msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Zdá se, že vše je kompletně uloženo v paměti"
#: ajax/categories/rescan.php:29
msgid "No calendars found."
@@ -44,19 +44,19 @@ msgstr "Nesprávný kalendář"
msgid ""
"The file contained either no events or all events are already saved in your "
"calendar."
-msgstr ""
+msgstr "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři."
#: ajax/import/dropimport.php:31 ajax/import/import.php:67
msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "Záznam byl uložen v novém kalendáři"
#: ajax/import/import.php:56
msgid "Import failed"
-msgstr ""
+msgstr "Import selhal"
#: ajax/import/import.php:69
msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "záznamů bylo uloženo ve Vašem kalendáři"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
@@ -161,7 +161,7 @@ msgstr "Pracovní"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "od"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -350,79 +350,79 @@ msgstr "Kal."
#: templates/calendar.php:6
msgid "Sun."
-msgstr ""
+msgstr "Ne"
#: templates/calendar.php:6
msgid "Mon."
-msgstr ""
+msgstr "Po"
#: templates/calendar.php:6
msgid "Tue."
-msgstr ""
+msgstr "Út"
#: templates/calendar.php:6
msgid "Wed."
-msgstr ""
+msgstr "St"
#: templates/calendar.php:6
msgid "Thu."
-msgstr ""
+msgstr "Čt"
#: templates/calendar.php:6
msgid "Fri."
-msgstr ""
+msgstr "Pá"
#: templates/calendar.php:6
msgid "Sat."
-msgstr ""
+msgstr "So"
#: templates/calendar.php:8
msgid "Jan."
-msgstr ""
+msgstr "Ne"
#: templates/calendar.php:8
msgid "Feb."
-msgstr ""
+msgstr "únor"
#: templates/calendar.php:8
msgid "Mar."
-msgstr ""
+msgstr "březen"
#: templates/calendar.php:8
msgid "Apr."
-msgstr ""
+msgstr "duben"
#: templates/calendar.php:8
msgid "May."
-msgstr ""
+msgstr "květen"
#: templates/calendar.php:8
msgid "Jun."
-msgstr ""
+msgstr "červen"
#: templates/calendar.php:8
msgid "Jul."
-msgstr ""
+msgstr "červenec"
#: templates/calendar.php:8
msgid "Aug."
-msgstr ""
+msgstr "srpen"
#: templates/calendar.php:8
msgid "Sep."
-msgstr ""
+msgstr "září"
#: templates/calendar.php:8
msgid "Oct."
-msgstr ""
+msgstr "říjen"
#: templates/calendar.php:8
msgid "Nov."
-msgstr ""
+msgstr "listopad"
#: templates/calendar.php:8
msgid "Dec."
-msgstr ""
+msgstr "prosinec"
#: templates/calendar.php:11
msgid "All day"
@@ -479,7 +479,7 @@ msgstr "dnes"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -687,7 +687,7 @@ msgstr "Importovat soubor kalendáře"
#: templates/part.import.php:24
msgid "Please choose a calendar"
-msgstr ""
+msgstr "Vyberte prosím kalendář"
#: templates/part.import.php:36
msgid "Name of new calendar"
@@ -695,13 +695,13 @@ msgstr "Název nového kalendáře"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "Použijte volné jméno!"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny."
#: templates/part.import.php:47
msgid "Import"
@@ -733,7 +733,7 @@ msgstr "v"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Hlavní"
#: templates/settings.php:15
msgid "Timezone"
@@ -741,11 +741,11 @@ msgstr "Časové pásmo"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Obnovit auronaricky časovou zónu."
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Formát času"
#: templates/settings.php:57
msgid "24h"
@@ -757,39 +757,39 @@ msgstr "12h"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Týden začína v"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "Paměť"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Vymazat paměť pro opakuijísí se záznamy"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Kalendář CalDAV synchronizuje adresy"
#: templates/settings.php:87
msgid "more info"
-msgstr ""
+msgstr "podrobnosti"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primární adresa (veřejná)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Odkaz(y) kalendáře pouze pro čtení"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 04e3220195a..fefba5eec4c 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "jméno elementu není nastaveno."
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Nelze analyzovat kontakty"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Chyba během přidávání vlastností kontaktu:"
#: ajax/contact/deleteproperty.php:37
msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Nelze získat platnou adresu."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
@@ -277,7 +277,7 @@ msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Chyba při otevírání obrázku profilu"
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -287,6 +287,10 @@ msgstr "Vybrat typ"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
+msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
msgstr ""
#: js/loader.js:49
@@ -303,11 +307,11 @@ msgstr "neimportováno."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Zobrazované jméno nemůže zůstat prázdné."
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresář nenalezen:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Narozeniny"
#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "Pracovní"
#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "Volat"
#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Klienti"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "Dodavatel"
#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Prázdniny"
#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Nápady"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Cestování"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Schůzka"
#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Ostatní"
#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Osobní"
#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Projekty"
#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Dotazy"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Import"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zavřít"
#: templates/index.php:37
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Klávesoví zkratky"
#: templates/index.php:39
msgid "Navigation"
-msgstr ""
+msgstr "Navigace"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr ""
+msgstr "Následující kontakt v seznamu"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr ""
+msgstr "Předchozí kontakt v seznamu"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Rozbalit/sbalit aktuální Adresář"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Následující Adresář"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Předchozí Adresář"
#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Akce"
#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Občerstvit seznam kontaktů"
#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Přidat kontakt"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Předat nový Adresář"
#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
+msgstr "Odstranit aktuální kontakt"
#: templates/part.contact.php:17
msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Zadejte přezdívku"
#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Web"
#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Přejít na web"
#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "PO box"
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "Ulice"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Ulice a číslo"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Rozšířené"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "Byt číslo atd."
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Kraj"
#: templates/part.edit_address_dialog.php:45
msgid "E.g. state or province"
-msgstr ""
+msgstr "Např. stát nebo okres"
#: templates/part.edit_address_dialog.php:48
msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "PSČ"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "PSČ"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavit adresář"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Vybrat Adresář"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
-msgstr ""
+msgstr "Vložte jméno"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
-msgstr ""
+msgstr "Vložte popis"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Zobrazit odklaz CardDAV:"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Zobrazit odkaz VCF pouze pro čtení"
#: templates/settings.php:26
msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nový adresář"
#: templates/settings.php:41
msgid "Name"
-msgstr ""
+msgstr "Název"
#: templates/settings.php:42
msgid "Description"
-msgstr ""
+msgstr "Popis"
#: templates/settings.php:43
msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Storno"
#: templates/settings.php:49
msgid "More..."
-msgstr ""
+msgstr "Více..."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index b168a2b7e1e..ce5a00fe065 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:26+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "Soubory"
#: js/fileactions.js:95
msgid "Unshare"
-msgstr ""
+msgstr "Odsdílet"
#: js/fileactions.js:97 templates/index.php:56
msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "Vymazat"
#: js/filelist.js:141
msgid "already exists"
-msgstr ""
+msgstr "již existuje"
#: js/filelist.js:141
msgid "replace"
-msgstr ""
+msgstr "zaměnit"
#: js/filelist.js:141
msgid "cancel"
-msgstr ""
+msgstr "storno"
#: js/filelist.js:195
msgid "replaced"
-msgstr ""
+msgstr "zaměněno"
#: js/filelist.js:195
msgid "with"
-msgstr ""
+msgstr "s"
#: js/filelist.js:195 js/filelist.js:256
msgid "undo"
-msgstr ""
+msgstr "zpět"
#: js/filelist.js:256
msgid "deleted"
-msgstr ""
+msgstr "smazáno"
#: js/files.js:170
msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "Nahrávání zrušeno"
msgid "Invalid name, '/' is not allowed."
msgstr "Špatné jméno, znak '/' není povolen"
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
msgid "Size"
msgstr "Velikost"
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:659
+#: js/files.js:722
msgid "folder"
msgstr "adresář"
-#: js/files.js:661
+#: js/files.js:724
msgid "folders"
msgstr "adresáře"
-#: js/files.js:669
+#: js/files.js:732
msgid "file"
msgstr "soubor"
-#: js/files.js:671
+#: js/files.js:734
msgid "files"
msgstr "soubory"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 31ccf1b3f90..4055cc18fcc 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:33+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Kryptování"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Při kryptování vynechat následující typy souborů"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Žádný"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Povolit kryptování"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 67d9a7179e8..26ba61410b1 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:38+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Vaše sdílené soubory"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Položka"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Sdíleno s:"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Práva"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Číst"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Editovat"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Smazat"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Povolit další sdílení"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 15207fae022..cac58a2122d 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:32+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Vypršení všech verzí"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Povolit verzování souborů"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index 08c9c2054b5..f24db5838a0 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -10,88 +10,32 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:30+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: appinfo/app.php:37
+#: appinfo/app.php:39
msgid "Pictures"
msgstr "Obrázky"
-#: js/album_cover.js:44
+#: js/pictures.js:12
msgid "Share gallery"
-msgstr ""
+msgstr "Sdílet galerii"
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
msgid "Error: "
-msgstr ""
+msgstr "Chyba: "
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
msgid "Internal error"
-msgstr ""
-
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Nastavení"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Znovu prohledat"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Zastavit"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Sdílet"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Zpět"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Potvrzení odebrání"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Chcete odstranit album?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Změnit název alba"
+msgstr "Vnitřní chyba"
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Název nového alba"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Přehrávání"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 2d67565ff56..f6c62f88034 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
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 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:24+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: app.php:287
+#: app.php:288
msgid "Help"
-msgstr ""
+msgstr "Nápověda"
-#: app.php:294
+#: app.php:295
msgid "Personal"
-msgstr ""
+msgstr "Osobní"
-#: app.php:299
+#: app.php:300
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
-#: app.php:304
+#: app.php:305
msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
-#: app.php:311
+#: app.php:312
msgid "Apps"
-msgstr ""
+msgstr "Aplikace"
-#: app.php:313
+#: app.php:314
msgid "Admin"
-msgstr ""
+msgstr "Admin"
#: files.php:245
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Stahování ZIPu je vypnuto."
#: files.php:246
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Soubory je nutno stahovat samostatně."
#: files.php:246 files.php:271
msgid "Back to Files"
-msgstr ""
+msgstr "Zpět k souborům"
#: files.php:270
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Vybarné soubory jsou pro vytvoření zipu příliš velké."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikace není povolena"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Realce expirovala. Obnovte prosím stranu."
#: template.php:86
msgid "seconds ago"
-msgstr ""
+msgstr "před vteřinami"
#: template.php:87
msgid "1 minute ago"
-msgstr ""
+msgstr "před 1 minutou"
#: template.php:88
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "před %d minutami"
#: template.php:91
msgid "today"
-msgstr ""
+msgstr "dnes"
#: template.php:92
msgid "yesterday"
-msgstr ""
+msgstr "včera"
#: template.php:93
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "před %d dny"
#: template.php:94
msgid "last month"
-msgstr ""
+msgstr "minulý měsíc"
#: template.php:95
msgid "months ago"
-msgstr ""
+msgstr "před měsíci"
#: template.php:96
msgid "last year"
-msgstr ""
+msgstr "loni"
#: template.php:97
msgid "years ago"
-msgstr ""
+msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 90e81ef9c85..39bf639f582 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.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-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:29+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nepodařílo se stáhnout seznam z App Store"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -44,7 +44,7 @@ msgstr "Chybný dotaz"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -52,7 +52,7 @@ msgstr "Jazyk byl změněn"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Chyba"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -72,23 +72,23 @@ msgstr "Česky"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Bezpečnostní upozornění"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "spustit jednu úlohu s každou nataženou stranou"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je registrován jako služba webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "použijte systémovou službu cron"
#: templates/admin.php:39
msgid "Log"
@@ -232,7 +232,7 @@ msgstr "Jiné"
#: templates/users.php:80 templates/users.php:112
msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/cs_CZ/user_migrate.po b/l10n/cs_CZ/user_migrate.po
index f3602dccae2..74cee0cec42 100644
--- a/l10n/cs_CZ/user_migrate.po
+++ b/l10n/cs_CZ/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:51+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Export"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Během vytváření souboru exportu došlo k chybě"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Nastala chyba"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Export Vašeho uživatelského účtu"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Import uživatelského účtu"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip soubor uživatele ownCloud"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Import"
diff --git a/l10n/cs_CZ/user_openid.po b/l10n/cs_CZ/user_openid.po
index 14f4ed1354c..f2fe13f3345 100644
--- a/l10n/cs_CZ/user_openid.po
+++ b/l10n/cs_CZ/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:48+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Toto je OpenID server endpoint. Více informací na"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identita: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Oblast: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Uživatel: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Login"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Chyba: <b>Uživatel není zvolen"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "s touto adresou se můžete autrorizovat na další strany"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Autorizovaný OpenID poskytovatel"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 7180b10c289..03723a78472 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Kunne ikke finde en gyldig adresse."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fejl"
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -814,11 +818,11 @@ msgstr "Konfigurer adressebøger"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 2550ffd9033..3948b8ecfb9 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -24,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 20:22+0000\n"
-"Last-Translator: driz <driz@i2pmail.org>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -256,8 +256,8 @@ msgstr "Konnte keine gültige Adresse abrufen"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
@@ -303,6 +303,10 @@ msgid ""
"them to be deleted."
msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Ergebnis: "
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 548db19793d..bb902999413 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -7,15 +7,16 @@
# Dimitris M. <monopatis@gmail.com>, 2012.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
# <vagelis@cyberdest.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -245,8 +246,8 @@ msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Σφάλμα"
@@ -280,7 +281,7 @@ msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -292,6 +293,10 @@ msgid ""
"them to be deleted."
msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Αποτέλεσμα: "
@@ -306,11 +311,11 @@ msgstr " απέτυχε."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Το όνομα προβολής δεν μπορεί να είναι κενό. "
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Το βιβλίο διευθύνσεων δεν βρέθηκε:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -484,11 +489,11 @@ msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου δι
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Επόμενο βιβλίο διευθύνσεων"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Προηγούμενο βιβλίο διευθύνσεων"
#: templates/index.php:54
msgid "Actions"
@@ -815,11 +820,11 @@ msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
msgid "Select Address Books"
msgstr "Επέλεξε βιβλίο διευθύνσεων"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Εισαγωγή ονόματος"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Εισαγωγή περιγραφής"
@@ -841,11 +846,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου CardDav"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση"
#: templates/settings.php:26
msgid "Download"
diff --git a/l10n/eo/admin_dependencies_chk.po b/l10n/eo/admin_dependencies_chk.po
index be22a0e5e85..5fb88e68aed 100644
--- a/l10n/eo/admin_dependencies_chk.po
+++ b/l10n/eo/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:59+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "La modulo php-gd necesas por krei bildetojn."
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "La modulo php-ldap necesas por konekti al via LDAP-servilo."
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo."
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "La modulo php-ctype necesas por validkontroli datumojn."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Stato de dependoj"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Uzata de:"
diff --git a/l10n/eo/admin_migrate.po b/l10n/eo/admin_migrate.po
index ca3e132bd3b..61384915c2a 100644
--- a/l10n/eo/admin_migrate.po
+++ b/l10n/eo/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:32+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Malenporti ĉi tiun aperon de ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Malenporti"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7a635c7d611..5dd32cabbb2 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Ne eblis ekhavi validan adreson."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Eraro"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Rezulto: "
@@ -811,11 +815,11 @@ msgstr "Agordi adresarojn"
msgid "Select Address Books"
msgstr "Elektu adresarojn"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Enigu nomon"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Enigu priskribon"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 3e173e196c2..dbcedb1a56a 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:41+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Ĉifrado"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Malinkluzivigi la jenajn dosiertipojn el ĉifrado"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Nenio"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Kapabligi ĉifradon"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 089953a7283..11e4211e707 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 22:09+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Malena memorilo"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Surmetingo"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Motoro"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Agordo"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Malneproj"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Aplikebla"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Aldoni surmetingon"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Nenio agordita"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Ĉiuj uzantoj"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Grupoj"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Uzantoj"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Radikaj SSL-atestoj"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Enporti radikan ateston"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kapabligi malenan memorilon de uzanto"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index ba8f508b669..bab4de8df6d 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:32+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Viaj kunhavigitaj dosieroj"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Ero"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Kunhavigita kun"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Permesoj"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Legi"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Redakti"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Kapabligi rekunhavigon"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 0d6b7356f99..23851036eaa 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:20+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Eksvalidigi ĉiujn eldonojn"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Kapabligi dosiereldonkontrolon"
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
index a829a6ae23a..97201072790 100644
--- a/l10n/eo/tasks.po
+++ b/l10n/eo/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:27+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Nevalida dato/horo"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Taskoj"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Neniu kategorio"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Nespecifita"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=plej alta"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=meza"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=plej malalta"
#: lib/app.php:81
msgid "Empty Summary"
@@ -51,15 +52,15 @@ msgstr ""
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Nevalida plenuma elcento"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Nevalida pligravo"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Aldoni taskon"
#: templates/tasks.php:4
msgid "Order Due"
@@ -71,15 +72,15 @@ msgstr ""
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Ordigi laŭ plenumo"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Ordigi laŭ loko"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Ordigi laŭ pligravo"
#: templates/tasks.php:9
msgid "Order Label"
@@ -87,20 +88,20 @@ msgstr ""
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Ŝargante taskojn..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Grava"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Pli"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Malpli"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0a6274edd44..4167860d0e9 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:54+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Gastigo"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Baz-DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -36,7 +37,7 @@ msgstr ""
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Uzanto-DN"
#: templates/settings.php:10
msgid ""
@@ -47,15 +48,15 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Pasvorto"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtrilo de uzantensaluto"
#: templates/settings.php:12
#, php-format
@@ -67,11 +68,11 @@ msgstr ""
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtrilo de uzantolisto"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
@@ -79,11 +80,11 @@ msgstr ""
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filtrilo de grupo"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
@@ -91,19 +92,19 @@ msgstr ""
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Pordo"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Baza uzantarbo"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Baza gruparbo"
#: templates/settings.php:20
msgid "Group-Member association"
@@ -111,11 +112,11 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Uzi TLS-on"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
#: templates/settings.php:23
msgid ""
@@ -133,32 +134,32 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ne rekomendata, uzu ĝin nur por testoj."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de uzanto"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de grupo"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "duumoke"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Helpo"
diff --git a/l10n/eo/user_migrate.po b/l10n/eo/user_migrate.po
index 079fff49c79..27ea6386b0b 100644
--- a/l10n/eo/user_migrate.po
+++ b/l10n/eo/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:36+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Malenporti"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Io malsukcesis dum la enportota dosiero generiĝis"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Eraro okazis"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Malenporti vian uzantokonton"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Enporti uzantokonton"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ZIP-dosiero de uzanto de ownCloud"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Enporti"
diff --git a/l10n/eo/user_openid.po b/l10n/eo/user_openid.po
index b982103d358..237164674bb 100644
--- a/l10n/eo/user_openid.po
+++ b/l10n/eo/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 21:05+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Idento: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Regno: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Uzanto: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Ensaluti"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Eraro: <b>neniu uzanto estas elektita"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Rajtigita OpenID-provizanto"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Via adreso ĉe Wordpress, Identi.ca&hellip;"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index d3ffeee5d35..ad0191c21f9 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -245,8 +245,8 @@ msgstr "Fallo : no hay dirección valida"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fallo"
@@ -292,6 +292,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado :"
@@ -815,11 +819,11 @@ msgstr "Configurar agenda"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Introducir nombre"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Introducir descripción"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 74db6a2d970..32a4a0173a2 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Kehtiva aadressi hankimine ebaõnnestus"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Viga"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulemus: "
@@ -810,11 +814,11 @@ msgstr "Seadista aadressiraamatuid"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index df6730af068..e5bd8a9638c 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Ezin izan da eposta baliagarri bat hartu."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errorea"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Emaitza:"
@@ -812,11 +816,11 @@ msgstr "Konfiguratu helbide liburuak"
msgid "Select Address Books"
msgstr "Hautatu helbide-liburuak"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Sartu izena"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Sartu deskribapena"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index c0c80cfb384..96b07fd2758 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 585d7ae6c29..9744c2460b0 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Couldn't get a valid address."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "خطا"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "نتیجه:"
@@ -810,11 +814,11 @@ msgstr "پیکربندی کتابچه ی نشانی ها"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 537fe182c32..2030f4fc3c1 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 35b090e46b3..87156b512e5 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -243,8 +243,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Virhe"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulos: "
@@ -813,11 +817,11 @@ msgstr "Muokkaa osoitekirjoja"
msgid "Select Address Books"
msgstr "Valitse osoitekirjat"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Anna nimi"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Anna kuvaus"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6680c0a1830..87353de68a2 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -250,8 +250,8 @@ msgstr "Impossible de trouver une adresse valide."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erreur"
@@ -285,7 +285,7 @@ msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fich
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Erreur pendant le chargement de la photo de profil."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -297,6 +297,10 @@ msgid ""
"them to be deleted."
msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Résultat :"
@@ -820,11 +824,11 @@ msgstr "Paramétrer carnet d'adresses"
msgid "Select Address Books"
msgstr "Choix du carnet d'adresses"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Saisissez le nom"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Saisissez une description"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 609d9516210..972682b6ebb 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Non se puido obter un enderezo de correo válido."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -811,11 +815,11 @@ msgstr "Configurar libretas de enderezos"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 95a5b199da3..9660e8a9afe 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -812,11 +816,11 @@ msgstr "הגדר ספרי כתובות"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 75ab0abdb22..8e1653696d7 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 5c441e68bec..dcbf9514b9b 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Érvényes cím lekérése sikertelen"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hiba"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Eredmény: "
@@ -813,11 +817,11 @@ msgstr "Címlisták beállítása"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 582ad7d76f7..1395ba92c24 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 5a436a7a255..fd0e67d2cd5 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3e58eff041b..abc2bc17b11 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 2fec0e37284..f17c7177a90 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index b702f2eab37..21acc033d91 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-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 06:59+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -243,8 +243,8 @@ msgstr "Impossibile ottenere un indirizzo valido."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errore"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Risultato: "
@@ -813,11 +817,11 @@ msgstr "Configura rubriche"
msgid "Select Address Books"
msgstr "Seleziona rubriche"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Inserisci il nome"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Inserisci una descrizione"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index ffb62b14fe3..c2e3c68a493 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.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-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:10+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 07:12+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -48,8 +48,8 @@ msgstr "Eliminazione"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Abilita ri-condivisione"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
index 829120fa8a0..2ff1d630330 100644
--- a/l10n/it/tasks.po
+++ b/l10n/it/tasks.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-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 12:07+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 07:08+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "9=minima"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Riepilogo vuoto"
#: lib/app.php:93
msgid "Invalid percent complete"
@@ -96,11 +96,11 @@ msgstr "Importante"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Più"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Meno"
#: templates/tasks.php:29
msgid "Delete"
diff --git a/l10n/ja_JP/admin_dependencies_chk.po b/l10n/ja_JP/admin_dependencies_chk.po
index 1d928c91bdf..be8f217eba1 100644
--- a/l10n/ja_JP/admin_dependencies_chk.po
+++ b/l10n/ja_JP/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:08+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "php-jsonモジュールはアプリケーション間の内部通信に必要です"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gdモジュールはサムネイル画像の生成に必要です"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldapモジュールはLDAPサーバへの接続に必要です"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zipモジュールは複数ファイルの同時ダウンロードに必要です"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です"
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "php-ctypeモジュールはデータのバリデーションに必要です"
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xmlモジュールはWebDAVでのファイル共有に必要です"
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です"
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "依存関係の状況"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "利用先 :"
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
index b0603a4f42b..bfc0b807e08 100644
--- a/l10n/ja_JP/admin_migrate.po
+++ b/l10n/ja_JP/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:48+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "このownCloudをエクスポート"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "このownCloudのデータを含む圧縮形式のファイルを生成します。\nエクスポートのタイプを選択してください:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "エクスポート"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 90254140d20..c62d4af4541 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 01:51+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -159,7 +160,7 @@ msgstr "週の始まり"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "による"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -477,7 +478,7 @@ msgstr "今日"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "設定"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -731,7 +732,7 @@ msgstr "at"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "一般"
#: templates/settings.php:15
msgid "Timezone"
@@ -739,11 +740,11 @@ msgstr "タイムゾーン"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "自動的にタイムゾーンを更新"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "時刻の表示形式"
#: templates/settings.php:57
msgid "24h"
@@ -755,7 +756,7 @@ msgstr "12h"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "1週間の初めの曜日"
#: templates/settings.php:76
msgid "Cache"
@@ -767,7 +768,7 @@ msgstr "イベントを繰り返すためにキャッシュをクリアしてく
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URL"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1643d768f3a..a6720199293 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +241,8 @@ msgstr "有効なアドレスを取得できませんでした。"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "エラー"
@@ -275,7 +276,7 @@ msgstr "アップロードしようとしているファイルは、このサー
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "プロファイルの画像の読み込みエラー"
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -285,6 +286,10 @@ msgstr "タイプを選択"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
+msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
msgstr ""
#: js/loader.js:49
@@ -527,7 +532,7 @@ msgstr "ownCloudから写真を選択"
#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順"
#: templates/part.contact.php:36
msgid "Edit name details"
@@ -700,7 +705,7 @@ msgstr "アドレスブック"
#: templates/part.edit_name_dialog.php:23
msgid "Hon. prefixes"
-msgstr ""
+msgstr "敬称"
#: templates/part.edit_name_dialog.php:27
msgid "Miss"
@@ -740,7 +745,7 @@ msgstr "姓"
#: templates/part.edit_name_dialog.php:41
msgid "Hon. suffixes"
-msgstr "ストレージへの連絡先のアップロードエラー。"
+msgstr "称号"
#: templates/part.edit_name_dialog.php:45
msgid "J.D."
@@ -810,11 +815,11 @@ msgstr "アドレス帳を設定"
msgid "Select Address Books"
msgstr "連絡先を洗濯してください"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "名前を入力"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "説明を入力してください"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 5cf8f5a4c07..c9941a81c9c 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:43+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "暗号化"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "暗号化から除外するファイルタイプ"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "なし"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "暗号化を有効にする"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 6096d9408f5..1de6cdac432 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:46+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "外部ストレージ"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "マウントポイント"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "バックエンド"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "設定"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "オプション"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "適用範囲"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "マウントポイントを追加"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "未設定"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "すべてのユーザ"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "グループ"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "ユーザ"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "削除"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSLルート証明書"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "ルート証明書をインポート"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "ユーザの外部ストレージを有効にする"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "ユーザに外部ストレージのマウントを許可する"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index fcadb4bdc9f..fb178df41c5 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:58+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "共有ファイル"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "項目"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "で共有 "
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "許可"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "読込"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "編集"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "削除"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "再共有を有効にする"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "所有者でないファイルの共有を許可する"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index e61c39bff46..893e07db20b 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:41+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "すべてのバージョンを削除する"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "ファイルのバージョン管理を有効にする"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 79aec21152a..9964db29fa2 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 01:55+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -72,19 +73,19 @@ msgstr "セキュリティ警告"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "cron(自動定期実行)"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ページを開く毎にタスクを1つ実行"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.phpをwebcronサービスに登録しました"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "システムのcronサービスを使用"
#: templates/admin.php:39
msgid "Log"
diff --git a/l10n/ja_JP/tasks.po b/l10n/ja_JP/tasks.po
index fdd063c3ca0..13b0423ca16 100644
--- a/l10n/ja_JP/tasks.po
+++ b/l10n/ja_JP/tasks.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:40+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +21,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "無効な日付/時刻"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "タスク"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "カテゴリ無し"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "未指定"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=高"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=中"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=低"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "要旨が未記入"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "進捗%が不正"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "無効な優先度"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "タスクを追加"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "期日で並べ替え"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "リストで並び替え"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "完了で並べ替え"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "場所で並べ替え"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "優先度で並べ替え"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "ラベルで並べ替え"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "タスクをロード中..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "重要"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "詳細"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "閉じる"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "削除"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d19e9c5dd83..109dcef89fd 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:21+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +21,146 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "ホスト"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "ベースDN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "ユーザDN"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "パスワード"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "ユーザログインフィルタ"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "ユーザリストフィルタ"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "グループフィルタ"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "グループを取得するときに適用するフィルターを定義する。"
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "ポート"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "ベースユーザツリー"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "ベースグループツリー"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "グループとメンバーの関連付け"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "TLSを利用"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "SSL接続に利用しないでください、失敗します。"
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "SSL証明書の確認を無効にする。"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "推奨しません、テスト目的でのみ利用してください。"
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "ユーザ名の表示に利用するフィールド"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "グループ名の表示に利用するフィールド"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "グループのownCloud名の生成に利用するLDAP属性。"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "バイト"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "秒。変更後にキャッシュがクリアされます。"
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
index 04d95df0be9..a9ccee0222d 100644
--- a/l10n/ja_JP/user_migrate.po
+++ b/l10n/ja_JP/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:59+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "エクスポート"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "エクスポートファイルの生成時に何か不具合が発生しました。"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "エラーが発生しました"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "あなたのユーザアカウントをエクスポート"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "あなたのownCloudアカウントを含む圧縮形式のファイルを生成します。"
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "ユーザアカウントをインポート"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ownCloudユーザZip"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "インポート"
diff --git a/l10n/ja_JP/user_openid.po b/l10n/ja_JP/user_openid.po
index 877dc59cdf1..5fe4094e683 100644
--- a/l10n/ja_JP/user_openid.po
+++ b/l10n/ja_JP/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 06:36+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "識別子: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "レルム: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "ユーザ: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "ログイン"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "エラー: <b>ユーザが選択されていません"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "他のサイトにこのアドレスで認証することができます"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "認証されたOpenIDプロバイダ"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Wordpressのアドレス、Identi.ca、&hellip;"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 5ade5e1187e..2854ac20650 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "유효한 주소를 얻을 수 없습니다."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "오류"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "결과:"
@@ -811,11 +815,11 @@ msgstr "주소록 구성"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index e2d248e4536..472a09280ca 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 04921869c84..8f89a727561 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 18a053d1297..f9b6c5143e3 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 421574eb07d..50c48cac5c9 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Не можев да добијам исправна адреса."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Грешка"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Резултат: "
@@ -811,11 +815,11 @@ msgstr "Уреди адресари"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index a5435b96a5e..625f969556d 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Tidak boleh mendapat alamat yang sah."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ralat"
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Hasil: "
@@ -814,11 +818,11 @@ msgstr "Konfigurasi buku alamat"
msgid "Select Address Books"
msgstr "Pilih Buku Alamat"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Masukkan nama"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Masukkan keterangan"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index ea159661fe3..9472cf35d17 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Feil"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -813,11 +817,11 @@ msgstr "Konfigurer adressebøker"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 695acef5f6a..b2c16170f6d 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -814,11 +818,11 @@ msgstr "Bewerken adresboeken"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index e9742c79bc7..a3933bcc26c 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 04c9ce97a2e..598cdb30afd 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -243,8 +243,8 @@ msgstr "Nie można pobrać prawidłowego adresu."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Błąd"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Wynik: "
@@ -813,11 +817,11 @@ msgstr "Konfiguruj książkę adresową"
msgid "Select Address Books"
msgstr "Wybierz książki adresowe"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Wpisz nazwę"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Wprowadź opis"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index e0aa5a97bd4..650f1c397f0 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado:"
@@ -812,11 +816,11 @@ msgstr "Configurar agenda de endereços"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 964dae21963..6523b65a6c7 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -812,11 +816,11 @@ msgstr "Configurar livros de endereços"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0881e6a3b59..e3d9e31c1ea 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -812,11 +816,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4c7214c485c..a38d426bf55 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -246,8 +246,8 @@ msgstr "Не удалось получить адрес."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ошибка"
@@ -293,6 +293,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Результат:"
@@ -816,11 +820,11 @@ msgstr "Настроить адресную книгу"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index ef45c76a922..c80dd487697 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Nemôžem získať platnú adresu."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Výsledok: "
@@ -812,11 +816,11 @@ msgstr "Nastaviť adresáre"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Zadaj meno"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
index 0dc34327997..f08053b2894 100644
--- a/l10n/sl/admin_dependencies_chk.po
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:23+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -21,7 +22,7 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Modul php-json je potrebem"
#: settings.php:39
msgid ""
@@ -66,8 +67,8 @@ msgstr ""
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Stanje odvisnosti"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Uporablja:"
diff --git a/l10n/sl/admin_migrate.po b/l10n/sl/admin_migrate.po
index e4aec295fb2..5a600890b71 100644
--- a/l10n/sl/admin_migrate.po
+++ b/l10n/sl/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:17+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Izvozi to ownCloud namestitev"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n Prosimo, če izberete vrsto izvoza:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Izvozi"
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index b1792961b60..8d2ba48009e 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.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-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 13:25+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -23,11 +23,11 @@ msgstr ""
#: ajax/cache/status.php:19
msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Vsi koledarji niso povsem predpomnjeni"
#: ajax/cache/status.php:21
msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Izgleda, da je vse v predpomnilniku"
#: ajax/categories/rescan.php:29
msgid "No calendars found."
@@ -45,19 +45,19 @@ msgstr "Napačen koledar"
msgid ""
"The file contained either no events or all events are already saved in your "
"calendar."
-msgstr ""
+msgstr "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju."
#: ajax/import/dropimport.php:31 ajax/import/import.php:67
msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v nov koledar"
#: ajax/import/import.php:56
msgid "Import failed"
-msgstr ""
+msgstr "Uvoz je spodletel"
#: ajax/import/import.php:69
msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v vaš koledar"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
@@ -162,7 +162,7 @@ msgstr "Delo"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "od"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -351,79 +351,79 @@ msgstr "Kol."
#: templates/calendar.php:6
msgid "Sun."
-msgstr ""
+msgstr "ned."
#: templates/calendar.php:6
msgid "Mon."
-msgstr ""
+msgstr "pon."
#: templates/calendar.php:6
msgid "Tue."
-msgstr ""
+msgstr "tor."
#: templates/calendar.php:6
msgid "Wed."
-msgstr ""
+msgstr "sre."
#: templates/calendar.php:6
msgid "Thu."
-msgstr ""
+msgstr "čet."
#: templates/calendar.php:6
msgid "Fri."
-msgstr ""
+msgstr "pet."
#: templates/calendar.php:6
msgid "Sat."
-msgstr ""
+msgstr "sob."
#: templates/calendar.php:8
msgid "Jan."
-msgstr ""
+msgstr "jan."
#: templates/calendar.php:8
msgid "Feb."
-msgstr ""
+msgstr "feb."
#: templates/calendar.php:8
msgid "Mar."
-msgstr ""
+msgstr "mar."
#: templates/calendar.php:8
msgid "Apr."
-msgstr ""
+msgstr "apr."
#: templates/calendar.php:8
msgid "May."
-msgstr ""
+msgstr "maj"
#: templates/calendar.php:8
msgid "Jun."
-msgstr ""
+msgstr "jun."
#: templates/calendar.php:8
msgid "Jul."
-msgstr ""
+msgstr "jul."
#: templates/calendar.php:8
msgid "Aug."
-msgstr ""
+msgstr "avg."
#: templates/calendar.php:8
msgid "Sep."
-msgstr ""
+msgstr "sep."
#: templates/calendar.php:8
msgid "Oct."
-msgstr ""
+msgstr "okt."
#: templates/calendar.php:8
msgid "Nov."
-msgstr ""
+msgstr "nov."
#: templates/calendar.php:8
msgid "Dec."
-msgstr ""
+msgstr "dec."
#: templates/calendar.php:11
msgid "All day"
@@ -480,7 +480,7 @@ msgstr "Danes"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -688,7 +688,7 @@ msgstr "Uvozi datoteko koledarja"
#: templates/part.import.php:24
msgid "Please choose a calendar"
-msgstr ""
+msgstr "Prosimo, če izberete koledar"
#: templates/part.import.php:36
msgid "Name of new calendar"
@@ -696,13 +696,13 @@ msgstr "Ime novega koledarja"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "Izberite prosto ime!"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena."
#: templates/part.import.php:47
msgid "Import"
@@ -734,7 +734,7 @@ msgstr "pri"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Splošno"
#: templates/settings.php:15
msgid "Timezone"
@@ -742,11 +742,11 @@ msgstr "Časovni pas"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Samodejno posodobi časovni pas"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Oblika zapisa časa"
#: templates/settings.php:57
msgid "24h"
@@ -758,39 +758,39 @@ msgstr "12ur"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Začni teden z"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "Predpomnilnik"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Počisti predpomnilnik za ponavljajoče dogodke"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLji"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "CalDAV naslov za usklajevanje koledarjev"
#: templates/settings.php:87
msgid "more info"
-msgstr ""
+msgstr "dodatne informacije"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Glavni naslov (Kontakt et al)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "iCalendar povezava/e samo za branje"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 765e127a418..52c49881a14 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -68,7 +68,7 @@ msgstr "ime elementa ni nastavljeno."
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ne morem razčleniti stika:"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Poskušam dodati podvojeno lastnost:"
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Napaka pri dodajanju lastnosti stiku:"
#: ajax/contact/deleteproperty.php:37
msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Ne morem dobiti veljavnega naslova."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Napaka"
@@ -277,7 +277,7 @@ msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno veliko
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Napaka pri nalaganju slike profila."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -287,6 +287,10 @@ msgstr "Izberite vrsto"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
+msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
msgstr ""
#: js/loader.js:49
@@ -303,11 +307,11 @@ msgstr " je spodletelo."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Ime za prikaz ne more biti prazno."
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresar ni bil najden:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Rojstni dan"
#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "Poslovno"
#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "Klic"
#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Stranka"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "Dostavljalec"
#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Prazniki"
#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Potovanje"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "Jubilej"
#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Sestanek"
#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Drugo"
#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Osebno"
#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Vprašanja"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Uvozi"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zapri"
#: templates/index.php:37
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Bližnjice na tipkovnici"
#: templates/index.php:39
msgid "Navigation"
-msgstr ""
+msgstr "Krmarjenje"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr ""
+msgstr "Naslednji stik na seznamu"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr ""
+msgstr "Predhodni stik na seznamu"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Razširi/skrči trenutni adresar"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Naslednji adresar"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Predhodni adresar"
#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Dejanja"
#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Osveži seznam stikov"
#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nov stik"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nov adresar"
#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
+msgstr "Izbriši trenutni stik"
#: templates/part.contact.php:17
msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Vnesite vzdevek"
#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Spletna stran"
#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.nekastran.si"
#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Pojdi na spletno stran"
#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "Poštni predal"
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "Ulični naslov"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Ulica in štelika"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Razširjeno"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "Številka stanovanja itd."
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Regija"
#: templates/part.edit_address_dialog.php:45
msgid "E.g. state or province"
-msgstr ""
+msgstr "Npr. dežela ali pokrajina"
#: templates/part.edit_address_dialog.php:48
msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "Poštna št."
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "Poštna številka"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavi imenike"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Izberite adresarje"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
-msgstr ""
+msgstr "Vnesite ime"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
-msgstr ""
+msgstr "Vnesite opis"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Pokaži CardDav povezavo"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Pokaži VCF povezavo samo za branje"
#: templates/settings.php:26
msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nov imenik"
#: templates/settings.php:41
msgid "Name"
-msgstr ""
+msgstr "Ime"
#: templates/settings.php:42
msgid "Description"
-msgstr ""
+msgstr "Opis"
#: templates/settings.php:43
msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Prekliči"
#: templates/settings.php:49
msgid "More..."
-msgstr ""
+msgstr "Več..."
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ee97cf3b746..294eea91d13 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:19+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Šifriranje"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Naslednje vrste datotek naj se ne šifrirajo"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Brez"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Omogoči šifriranje"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index b43660a42e7..19d395b99dd 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.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-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-15 00:03+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:14+0000\n"
"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -20,35 +20,35 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Zunanja podatkovna shramba"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Priklopna točka"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Zaledje"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Nastavitve"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Možnosti"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Se uporablja"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Dodaj priklopno točko"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Ni nastavljeno"
#: templates/settings.php:63
msgid "All Users"
@@ -76,8 +76,8 @@ msgstr "Uvozi korenski certifikat"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr "Omogoči"
+msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 29a2310e260..5e6bbbb4859 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:25+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Zastaraj vse različice"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Omogoči sledenje različicam datotek"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index fb1e393186d..305737e78c5 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.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-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:09+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:37+0000\n"
"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ 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"
-#: app.php:287
+#: app.php:288
msgid "Help"
msgstr "Pomoč"
-#: app.php:294
+#: app.php:295
msgid "Personal"
msgstr "Osebno"
-#: app.php:299
+#: app.php:300
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:304
+#: app.php:305
msgid "Users"
msgstr "Uporabniki"
-#: app.php:311
+#: app.php:312
msgid "Apps"
msgstr "Aplikacije"
-#: app.php:313
+#: app.php:314
msgid "Admin"
msgstr "Skrbnik"
@@ -72,7 +72,7 @@ msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
#: template.php:86
msgid "seconds ago"
-msgstr ""
+msgstr "sekundami"
#: template.php:87
msgid "1 minute ago"
@@ -102,7 +102,7 @@ msgstr "prejšnji mesec"
#: template.php:95
msgid "months ago"
-msgstr ""
+msgstr "meseci"
#: template.php:96
msgid "last year"
@@ -110,4 +110,4 @@ msgstr "lani"
#: template.php:97
msgid "years ago"
-msgstr ""
+msgstr "leti"
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
index 484d5c1f727..6f77b49256f 100644
--- a/l10n/sl/tasks.po
+++ b/l10n/sl/tasks.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-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:45+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 15:38+0000\n"
"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr "Prazen povzetek"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Neveljaven odstotek dokončanja"
#: lib/app.php:107
msgid "Invalid priority"
@@ -88,11 +88,11 @@ msgstr ""
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Nalagam opravila..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Pomembno"
#: templates/tasks.php:23
msgid "More"
@@ -104,4 +104,4 @@ msgstr "Manj"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index b46b9b67977..e2b81635c51 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 15:42+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Gostitelj"
#: templates/settings.php:8
msgid ""
@@ -28,15 +29,15 @@ msgstr ""
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Osnovni DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Uporabnik DN"
#: templates/settings.php:10
msgid ""
@@ -47,11 +48,11 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Geslo"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Za anonimni dostop pustite polji za DN in geslo prazni."
#: templates/settings.php:12
msgid "User Login Filter"
@@ -95,7 +96,7 @@ msgstr ""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Vrata"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -111,11 +112,11 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Uporabi TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Onemogoči potrditev veljavnosti SSL certifikata."
#: templates/settings.php:23
msgid ""
@@ -153,7 +154,7 @@ msgstr ""
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "v bajtih"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Pomoč"
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
index 62302b69119..38b10648491 100644
--- a/l10n/sl/user_openid.po
+++ b/l10n/sl/user_openid.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-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 13:13+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:29+0000\n"
"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr "To je OpenID strežniška končna točka. Za več informacij si oglejte"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr "Istovetnost: <b>"
+msgstr "Identiteta: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Področje: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
@@ -48,8 +48,8 @@ msgstr "s tem naslovom se lahko overite tudi na drugih straneh"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr "Odobren OpenID ponudnik"
+msgstr "Odobren ponudnik OpenID"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr "Vaš naslov na Wordpress, Identi.ca, &hellip;"
+msgstr "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 48bc4a90b16..eb287908918 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 87d87ab2e5d..db92cfe5b3b 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 25c7058c75a..e729393237a 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index ec6bc7bdca8..bf01e365f7a 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -83,7 +83,7 @@ msgstr "Minst ett fält måste fyllas i."
#: ajax/contact/addproperty.php:76
msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Försöker lägga till dubblett:"
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
@@ -245,8 +245,8 @@ msgstr "Kunde inte hitta en giltig adress."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fel"
@@ -280,7 +280,7 @@ msgstr "Filen du försöker ladda upp är större än den maximala storleken fö
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Fel vid hämtning av profilbild."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -292,6 +292,10 @@ msgid ""
"them to be deleted."
msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -815,11 +819,11 @@ msgstr "Anpassa adressböcker."
msgid "Select Address Books"
msgstr "Välj adressböcker"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Ange namn"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Ange beskrivning"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 7ebf04e55cf..8472f3c85eb 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index e905c22f86b..ac6f293833a 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/bookmarks.pot b/l10n/templates/bookmarks.pot
index b96ce9f1e77..dea5e32df8d 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-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 751969a0bfe..28e860b0a01 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-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 92d0ca5fc13..d96ef4d6ecb 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-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 99b041e1c82..d0746ae1880 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-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/files.pot b/l10n/templates/files.pot
index 26f5eacee83..e7daa79da35 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-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/files_encryption.pot b/l10n/templates/files_encryption.pot
index a463731bf95..dca7c8a90e4 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/files_external.pot b/l10n/templates/files_external.pot
index 0674e0b95d4..7faee545321 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/files_sharing.pot b/l10n/templates/files_sharing.pot
index c74bc72d36a..1c0459cba94 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/files_versions.pot b/l10n/templates/files_versions.pot
index 7a68a39a418..774fdabb759 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 e77e777229a..abc1a902c5f 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-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 97bbaa86450..98a71ea9fa0 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-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 fb5d0a755df..f74f546c3a9 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-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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 b0ea4703cce..5cff99d6d6c 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-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/tasks.pot b/l10n/templates/tasks.pot
index b23ae36239a..7a11e25c67a 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/user_ldap.pot b/l10n/templates/user_ldap.pot
index f554a64978b..8c5e5376a16 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/user_migrate.pot b/l10n/templates/user_migrate.pot
index 0367e1a634b..82982f7d3a2 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/user_openid.pot b/l10n/templates/user_openid.pot
index 211f8054b1a..03e646ee42a 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"POT-Creation-Date: 2012-08-16 02:04+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/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 88f3f467d4b..ac7e298b07b 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.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-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 14:39+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "ไม่สามารถดึงที่อยู่ที่ถู
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "พบข้อผิดพลาด"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "ผลลัพธ์: "
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 79c0485eddc..bcf5ad88c3e 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -242,8 +242,8 @@ msgstr "Geçerli bir adres alınamadı."
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hata"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Sonuç: "
@@ -812,11 +816,11 @@ msgstr "Adres defterini yapılandır"
msgid "Select Address Books"
msgstr "Adres deftelerini seçiniz"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "İsim giriniz"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Tanım giriniz"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3cb6c2aa249..a9c12c6def1 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 3568844e5b6..5533bf5bc52 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index 8a348956c14..fc13248c053 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 0c73f885ca4..f863dd7a043 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "无法获取一个合法的地址。"
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "错误"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "结果: "
@@ -812,11 +816,11 @@ msgstr "配置地址簿"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index d3df1f28104..98be89a1619 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: 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:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""