[tx-robot] updated from transifex

3 files changed, 122 insertions, 78 deletions

diff --git a/l10n/is/core.po b/l10n/is/core.po
index a9ac3082288..e4e28667bae 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:853
+#: js/js.js:866
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:854
+#: js/js.js:867
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:855
+#: js/js.js:868
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:856
+#: js/js.js:869
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:857
+#: js/js.js:870
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:858
+#: js/js.js:871
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:859
+#: js/js.js:872
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:860
+#: js/js.js:873
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:874
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:862
+#: js/js.js:875
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:863
+#: js/js.js:876
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -267,6 +267,46 @@ msgstr "Í lagi"
 msgid "Error loading message template: {error}"
 msgstr ""
 
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
diff --git a/l10n/is/files.po b/l10n/is/files.po
index b5561e49004..e53fa55a725 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Tókst ekki að skrifa á disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -86,144 +90,148 @@ msgstr "Ógild mappa."
 msgid "Files"
 msgstr "Skrár"
 
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
 
-#: js/file-upload.js:24
+#: js/file-upload.js:255
 msgid "Not enough space available"
 msgstr "Ekki nægt pláss tiltækt"
 
-#: js/file-upload.js:64
+#: js/file-upload.js:322
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/file-upload.js:239
+#: js/file-upload.js:520
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
 msgid "Error"
 msgstr "Villa"
 
-#: js/fileactions.js:116
+#: js/fileactions.js:119
 msgid "Share"
 msgstr "Deila"
 
-#: js/fileactions.js:126
+#: js/fileactions.js:131
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:192
+#: js/fileactions.js:197
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:307
+#: js/filelist.js:416
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:354
+#: js/filelist.js:463
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:354
+#: js/filelist.js:463
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:432
+#: js/filelist.js:541
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
 msgid "'.' is an invalid file name."
 msgstr "'.' er ekki leyfilegt nafn."
 
-#: js/files.js:56
+#: js/files.js:29
 msgid "File name cannot be empty."
 msgstr "Nafn skráar má ekki vera tómt"
 
-#: js/files.js:64
+#: js/files.js:37
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
 
-#: js/files.js:78
+#: js/files.js:51
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:82
+#: js/files.js:55
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:94
+#: js/files.js:67
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:245
+#: js/files.js:296
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
 msgid "Modified"
 msgstr "Breytt"
 
@@ -232,7 +240,7 @@ msgstr "Breytt"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
 msgid "Upload"
 msgstr "Senda inn"
 
@@ -268,65 +276,65 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
 msgid "Save"
 msgstr "Vista"
 
-#: templates/index.php:7
+#: templates/index.php:6
 msgid "New"
 msgstr "Nýtt"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Texta skrá"
 
-#: templates/index.php:12
+#: templates/index.php:11
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:41
+#: templates/index.php:33
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:39
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:52
+#: templates/index.php:45
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:50
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:75
+#: templates/index.php:67
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:108
+#: templates/index.php:100
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:110
+#: templates/index.php:102
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
 
-#: templates/index.php:115
+#: templates/index.php:107
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:118
+#: templates/index.php:110
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 033cdb62333..928b1480018 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-18 11:47-0400\n"
-"PO-Revision-Date: 2013-09-18 15:47+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -110,11 +110,7 @@ msgid ""
 "successfully updated."
 msgstr ""
 
-#: changepassword/controller.php:92
-msgid "message"
-msgstr ""
-
-#: changepassword/controller.php:103
+#: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
 msgstr ""