summaryrefslogtreecommitdiffstats
path: root/l10n/templates/contacts.pot
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/templates/contacts.pot
parent4c638f101e09cbe43a2114c64ebb30774bafce4b (diff)
downloadnextcloud-server-1e6dc6751700a91faff463f8f2840cf24e742f37.tar.gz
nextcloud-server-1e6dc6751700a91faff463f8f2840cf24e742f37.zip
[tx-robot] updated from transifex
Diffstat (limited to 'l10n/templates/contacts.pot')
-rw-r--r--l10n/templates/contacts.pot10
1 files changed, 7 insertions, 3 deletions
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 ""