Merge branch 'master' into trashbin_encryption

Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php

5 files changed, 84 insertions, 76 deletions

diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 385d32959dc..d545c83f5ee 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -157,59 +157,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:764
+#: js/js.js:767
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:768
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:769
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:770
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:771
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:772
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:773
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:774
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:775
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:776
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:777
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:778
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:779
 msgid "years ago"
 msgstr ""
 
@@ -239,8 +239,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
 msgid "Error"
 msgstr ""
 
@@ -252,15 +252,15 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr "Compartir"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:93
+msgid "Share"
+msgstr "Compartir"
+
+#: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
 msgstr ""
 
@@ -356,23 +356,23 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:373 js/share.js:569
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:582
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:594
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:609
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:620
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 633ccdec7d2..a29c8d55495 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
@@ -151,74 +151,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Clauder"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:969
+#: js/files.js:970
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:972
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:980
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:982
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 7fa22302eb4..060fd6f7d2c 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:398
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:435
+#: lib/config.php:401
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
 msgstr "Usatores"
 
 #: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
 msgid "Delete"
 msgstr "Deler"
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:139
+#: templates/settings.php:136
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:158
+#: templates/settings.php:154
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index adba7ebd96f..5c26542ab60 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
 msgid "Name"
 msgstr "Nomine"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:161
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:163
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:171
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:173
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,7 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Deler"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 774eb8a0947..46c5a721eb6 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Interlingua"