Merge branch 'master' into fixing-1354-master

Conflicts:
	settings/admin.php
	settings/templates/admin.php

5 files changed, 115 insertions, 108 deletions

diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index d685740ac94..be55347d047 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -169,55 +169,55 @@ msgstr "Grudzień"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:759
+#: js/js.js:760
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:760
+#: js/js.js:761
 msgid "1 minute ago"
 msgstr "1 minute temu"
 
-#: js/js.js:761
+#: js/js.js:762
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:762
+#: js/js.js:763
 msgid "1 hour ago"
 msgstr "1 godzine temu"
 
-#: js/js.js:763
+#: js/js.js:764
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:764
+#: js/js.js:765
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:765
+#: js/js.js:766
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:766
+#: js/js.js:767
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "last month"
 msgstr "ostani miesiąc"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "last year"
 msgstr "ostatni rok"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "years ago"
 msgstr "lat temu"
 
@@ -572,14 +572,18 @@ msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "Zapamiętanie"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Zaloguj"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "wstecz"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index b6554c153a8..86f9c33c283 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,46 +25,46 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/upload.php:17
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Plik nie został załadowany. Nieznany błąd"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Przesłano plik"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Plik przesłano tylko częściowo"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Brak katalogu tymczasowego"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:52
 msgid "Not enough space available"
 msgstr "Za mało miejsca"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -76,11 +76,15 @@ msgstr "Pliki"
 msgid "Unshare"
 msgstr "Nie udostępniaj"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Usuwa element"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -185,31 +189,31 @@ msgstr "URL nie może być pusty."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} pliki"
 
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 21fa364ff19..acf7f3f06eb 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.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-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Szyfrowanie"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Szyfrowanie"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Wyłącz następujące typy plików z szyfrowania"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Brak"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 748f62eaace..3f8e7a95647 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,35 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} pliki"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index ffae537e261..7849faf3679 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie mogę załadować listy aplikacji"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Błąd uwierzytelniania"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupa już istnieje"
@@ -56,10 +65,6 @@ msgstr "Niepoprawny email"
 msgid "Unable to delete group"
 msgstr "Nie można usunąć grupy"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Błąd uwierzytelniania"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nie można usunąć użytkownika"
@@ -122,7 +127,7 @@ msgstr "Błąd"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
@@ -199,67 +204,83 @@ msgstr "Pobierz klienta dla Androida"
 msgid "Download iOS Client"
 msgstr "Pobierz klienta dla iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "Wyświetlanie"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Adres e-mail użytkownika"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -293,10 +314,6 @@ msgstr "Bez limitu"
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupa Admin"