Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
	apps/files/index.php

5 files changed, 58 insertions, 58 deletions

diff --git a/l10n/is/core.po b/l10n/is/core.po
index 643a8c16821..a4202c883c6 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-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:50+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"
@@ -171,55 +171,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:812
+#: js/js.js:821
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:813
+#: js/js.js:822
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:814
+#: js/js.js:823
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:815
+#: js/js.js:824
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:816
+#: js/js.js:825
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:817
+#: js/js.js:826
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:827
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:819
+#: js/js.js:828
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:820
+#: js/js.js:829
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:821
+#: js/js.js:830
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:822
+#: js/js.js:831
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -403,7 +403,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
 #, php-format
 msgid "%s password reset"
 msgstr ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 10e1d535f40..b5561e49004 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-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+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"
@@ -111,7 +111,7 @@ msgstr "Vefslóð má ekki vera tóm."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
 msgid "Error"
 msgstr "Villa"
 
@@ -127,57 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:305
+#: js/filelist.js:307
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:352
+#: js/filelist.js:354
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:352
+#: js/filelist.js:354
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:430
+#: js/filelist.js:432
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:561
+#: js/filelist.js:563
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:626
+#: js/filelist.js:628
 msgid "files uploading"
 msgstr ""
 
@@ -215,15 +215,15 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
 msgid "Modified"
 msgstr "Breytt"
 
@@ -300,33 +300,33 @@ msgstr ""
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:73
+#: templates/index.php:75
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:105
+#: templates/index.php:108
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:107
+#: templates/index.php:110
 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:112
+#: templates/index.php:115
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:115
+#: templates/index.php:118
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 20e744006b8..bfd1462e056 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -63,7 +63,7 @@ msgstr "%s deildi möppunni %s með þér"
 msgid "%s shared the file %s with you"
 msgstr "%s deildi skránni %s með þér"
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
 msgid "Download"
 msgstr "Niðurhal"
 
@@ -75,6 +75,6 @@ msgstr "Senda inn"
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/public.php:85
+#: templates/public.php:89
 msgid "No preview available for"
 msgstr "Yfirlit ekki í boði fyrir"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 5f777e83b7c..52e3e20debc 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -85,47 +85,47 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Gera óvirkt"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Virkja"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Andartak...."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Uppfæri..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Villa"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Uppfæra"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Uppfært"
 
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 389e4c206ef..5f4609f359b 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"