backmerge r9210

git-svn-id: http://piwigo.org/svn/branches/2.1@9236 68402e56-0260-453c-a942-63ccdbb3a9ee

16 files changed, 50 insertions, 5 deletions

diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php
index a9d272b2b..108171106 100644
--- a/language/ka_GE/common.lang.php
+++ b/language/ka_GE/common.lang.php
@@ -329,7 +329,10 @@ $lang['Category: %s'] = 'კატეგორია: %s';
 $lang['Picture name: %s'] = 'სახელი: %s';
 $lang['Creation date: %s'] = 'გადაღების დრო: %s';
 $lang['Waiting page: %s'] = 'მოცდის გვერდი: %s';
+$lang['Picture uploaded by %s'] = 'ფოტო ატვირთულია %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'მომხმარებლის არასწორი სტატუსი "სტუმარი", გამოიყენეთ ძირითადი სტატუსი. გთხოვთ შეატყობინოთ ადმინისტრატორს.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 $lang['a user use already this mail address'] = 'მომხმარებელი ასეთი მისამართით უკვე არსებობს';
 $lang['Category results for'] = 'დღის კატეგორიების რეზულტატი';
diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php
index 7db529cc0..7b0d7c971 100644
--- a/language/mk_MK/common.lang.php
+++ b/language/mk_MK/common.lang.php
@@ -335,6 +335,7 @@ $lang['Category: %s'] = 'Категорија: %s';
 $lang['Picture name: %s'] = 'Име на фотографијата: %s';
 $lang['Creation date: %s'] = 'Дата на создавање: %s';
 $lang['Waiting page: %s'] = 'Страна на чекање: %s';
+$lang['Picture uploaded by %s'] = 'Фотографијата е прикачена од %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Грешка при најавувањето како гостин.';
 $lang['Submit'] = 'Поднесува';
 $lang['Yes'] = 'Да';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 284dcfd8d..db4e529f4 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -324,7 +324,10 @@ $lang['Category: %s'] = 'Categorie: %s';
 $lang['Picture name: %s'] = 'Afbeeldingsnaam: %s';
 $lang['Creation date: %s'] = 'Aanmaakdatum: %s';
 $lang['Waiting page: %s'] = 'Wacht pagina: %s';
+$lang['Picture uploaded by %s'] = 'Afbeelding ge-uploaded door %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Foutieve status voor gebruiker "guest", gebruik standaard status. Waarschuw de webbeheerder.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webbeheerder en speciale gebruiker kunnen deze methode niet gebruiken';
 $lang['a user use already this mail address'] = 'Een andere gebruiker maakt al gebruik van dit email-adres';
 $lang['Category results for'] = 'Categorie resultaten voor';
@@ -347,6 +350,7 @@ $lang['See images linked to this tag only'] = 'Toon afbeeldingen gelinkt met dez
 $lang['images posted during the last %d days'] = 'Afbeelding ontvangen binnen de afgelopen %d dagen';
 $lang['Choose an image'] = 'Kies een afbeelding om';
 $lang['Piwigo Help'] = 'Piwigo Help';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Are you sure?'] = 'Weet u het zeker?';
 $lang['delete this comment'] = 'verwijder dit commentaar';
 $lang['Name of the picture'] = 'Naam van de afbeelding';
@@ -375,4 +379,4 @@ $lang['This author modified following comment:'] = 'Deze bewerker wijzigde het v
 $lang['This author removed the comment with id %d'] = 'This author removed the comment with id %d';
 $lang['validate this comment'] = 'Valideer dit commentaar';
 
-?>
\ No newline at end of file
+?>
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index a7b12acd9..8e545dc1a 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Kategoria: %s';
 $lang['Picture name: %s'] = 'Nazwa zdjęcia: %s';
 $lang['Creation date: %s'] = 'Data utworzenia: %s';
 $lang['Waiting page: %s'] = 'Strona oczekująca: %s';
+$lang['Picture uploaded by %s'] = 'Zdjęcie wgrane przez %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zły status dla użytkownika "gość", używam domyślnego';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i special user nie mogą używać tej metody';
 $lang['a user use already this mail address'] = 'użytkownik już używa tego adresu email';
 $lang['Category results for'] = 'Wyniki kategorii dla';
@@ -356,6 +359,7 @@ $lang['show tag cloud'] = 'pokazuj tag jako chmurkę';
 $lang['cloud'] = 'chmurka';
 $lang['Are you sure?'] = 'Jesteś pewien?';
 $lang['delete this comment'] = 'usuń ten komentarz';
+//For version 2.1.0
 $lang['Reset to default values'] = 'Resetuj do domyślnych wartości';
 $lang['delete all images from your favorites'] = 'usuń wszystkie obrazy ze swoich ulubionych';
 $lang['Sent by'] = 'Wysłane przez';
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index f4b3321e0..95859b19c 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Categoria: %s';
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
 $lang['Waiting page: %s'] = 'Página de espera: %s';
+$lang['Picture uploaded by %s'] = 'Imagem enviada por %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método';
 $lang['a user use already this mail address'] = 'um outro usuário já utiliza este email';
 $lang['Category results for'] = 'Resultados da categoria para';
@@ -356,4 +359,4 @@ $lang['show tag cloud'] = 'mostar a nuvem de tags';
 $lang['cloud'] = 'nuvem';
 $lang['Are you sure?'] = 'Você tem certeza?';
 $lang['delete this comment'] = 'apagar este comentário';
-?>
\ No newline at end of file
+?>
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index 1e80de9a0..4f37c3e85 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Categoria: %s';
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
 $lang['Waiting page: %s'] = 'Página de espera: %s';
+$lang['Picture uploaded by %s'] = 'Imagem enviada por %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método';
 $lang['a user use already this mail address'] = 'um outro usuário já utiliza este email';
 $lang['Category results for'] = 'Resultados da categoria para';
@@ -356,4 +359,4 @@ $lang['show tag cloud'] = 'mostar a nuvem de tags';
 $lang['cloud'] = 'nuvem';
 $lang['Are you sure?'] = 'Você tem certeza?';
 $lang['delete this comment'] = 'apagar este comentário';
-?>
\ No newline at end of file
+?>
diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php
index 3d0cc6f1c..af5eaba13 100644
--- a/language/ro_RO/common.lang.php
+++ b/language/ro_RO/common.lang.php
@@ -316,6 +316,7 @@ $lang['Category: %s'] = 'Categorie : %s';
 $lang['Picture name: %s'] = 'Numele imaginii : %s';
 $lang['Creation date: %s'] = 'Data creării : %d';
 $lang['Waiting page: %s'] = 'Pagina de aşteptare : %s';
+$lang['Picture uploaded by %s'] = 'Imagine adăugată de %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statutul utilizatorului "invitat" este eronat, se vor folosi  parametrii impliciţi. Va rugăm sa informaţi webmasterul.';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administratorul, webmasterul şi utilizatorul special nu pot folosi aceasta metodă';
 $lang['a user use already this mail address'] = 'un alt utilizator foloseşte deja acest e-mail';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 24d7f2202..697c3b7d3 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Категория: %s';
 $lang['Picture name: %s'] = 'Название: %s';
 $lang['Creation date: %s'] = 'Дата съемки: %s';
 $lang['Waiting page: %s'] = 'Страница ожидания: %s';
+$lang['Picture uploaded by %s'] = 'Фотография загружена %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Неверный статус пользователя "гость", используйте статус по умолчанию. Пожалуйста сообщите вебмастеру.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 $lang['a user use already this mail address'] = 'пользователь с таким адресом уже есть';
 $lang['Category results for'] = 'Результат категорий для';
diff --git a/language/sh_RS/common.lang.php b/language/sh_RS/common.lang.php
index f1ca40792..7dc3ec17e 100644
--- a/language/sh_RS/common.lang.php
+++ b/language/sh_RS/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Kategorija: %s';
 $lang['Picture name: %s'] = 'Naziv slike: %s';
 $lang['Creation date: %s'] = 'Datum izrade: %s';
 $lang['Waiting page: %s'] = 'Stranica čekanja: %s';
+$lang['Picture uploaded by %s'] = 'Sliku prebacio %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Loš status za korisnika "guest", koristi se podrazumevani status. Molimo obavestite webmaster-a.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i posebni korisnik ne mogu koristiti ovu metodu';
 $lang['a user use already this mail address'] = 'korisnik već koristi ovu e-mail adresu';
 $lang['Category results for'] = 'Rezultati kategorije za ';
@@ -375,4 +378,4 @@ $lang['This author modified following comment:'] = 'Ovaj autor je menjao tekući
 $lang['This author removed the comment with id %d'] = 'Ovaj autor je uklonio komentar sa identifikacijom %d';
 $lang['delete this comment'] = 'obriši ovaj komentar';
 $lang['validate this comment'] = 'Overi ovaj komentar';
-?>
\ No newline at end of file
+?>
diff --git a/language/sk_SK/common.lang.php b/language/sk_SK/common.lang.php
index cb5b4ab64..47d53948b 100644
--- a/language/sk_SK/common.lang.php
+++ b/language/sk_SK/common.lang.php
@@ -330,7 +330,10 @@ $lang['Category: %s'] = 'Kategória: %s';
 $lang['Picture name: %s'] = '*Názov fotografie: %s';
 $lang['Creation date: %s'] = 'Dátum vytvorenia: %s';
 $lang['Waiting page: %s'] = 'Čakanie na stránku: %s';
+$lang['Picture uploaded by %s'] = 'Fotografia nahraná %s';
+
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zlý stav pre používateľa "hosť", bude použitý východzí stav. Prosím informujte webmastra.';
+
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrátor, webmaster a špeciálny používateľ nemôžu použiť túto metódu.';
 $lang['a user use already this mail address'] = 'táto e-mailová adresa je už používaná';
 $lang['Category results for'] = 'Výsledky pre kategórie';
@@ -358,8 +361,12 @@ $lang['group by letters'] = 'zoskupiť podľa písmen';
 $lang['letters'] = 'písmená';
 $lang['show tag cloud'] = 'zobraziť kľúčové slová v bubline';
 $lang['cloud'] = 'bublina';
+// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+
 $lang['Are you sure?'] = 'Ste si istý?';
 $lang['delete this comment'] = 'vymazať tento komentár';
+
+// missing translations 2.1.0
 $lang['Reset to default values'] = 'Obnoviť východzie hodnoty';
 $lang['delete all images from your favorites'] = 'vymazať všetky obrázky z Vašich obľúbených';
 $lang['Sent by'] = 'Poslané';
diff --git a/language/sl_SL/common.lang.php b/language/sl_SL/common.lang.php
index ae5715164..8ed9056f6 100644
--- a/language/sl_SL/common.lang.php
+++ b/language/sl_SL/common.lang.php
@@ -303,6 +303,7 @@ $lang['Category: %s'] = 'Kategorija: %s';
 $lang['Picture name: %s'] = 'Ime slike: %s';
 $lang['Creation date: %s'] = 'Datum nastanka: %s';
 $lang['Waiting page: %s'] = 'Čakajoče strani: %s';
+$lang['Picture uploaded by %s'] = 'Sliko naložil %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Nepravilen status uporabnika "guest", uporabljen bo privzeti status. Prosim obvestite skrbnika.';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, skrbnik in posebni uporabnik ne morejo uporabljati te metode';
 $lang['a user use already this mail address'] = 'email uporablja že drug uporabnik';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index 2bf32349f..de1c51368 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = 'Категорија: %s';
 $lang['Picture name: %s'] = 'Назив слике: %s';
 $lang['Creation date: %s'] = 'Датум израде: %s';
 $lang['Waiting page: %s'] = 'Страница чекања: %s';
+$lang['Picture uploaded by %s'] = 'Слику пребацио %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Лош статус за корисника "гост", користи се подразумевани статус. Молимо обавестите мајстора интернет страница.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster и посебни корисник не могу користити ову методу';
 $lang['a user use already this mail address'] = 'корисник већ користи ову адресу електронске поште';
 $lang['Category results for'] = 'Резултати категорије за ';
@@ -375,4 +378,4 @@ $lang['This author modified following comment:'] = 'Овај аутор је м�
 $lang['This author removed the comment with id %d'] = 'Овај аутор је уклонио коментар са идентификацијом %d';
 $lang['delete this comment'] = 'обриши овај коментар';
 $lang['validate this comment'] = 'овери овај коментар';
-?>
\ No newline at end of file
+?>
diff --git a/language/sv_SE/common.lang.php b/language/sv_SE/common.lang.php
index 11e70c9ba..14601d544 100644
--- a/language/sv_SE/common.lang.php
+++ b/language/sv_SE/common.lang.php
@@ -45,6 +45,7 @@ $lang['Category: %s'] = 'Kategori: %s';
 $lang['Picture name: %s'] = 'Bild namn: %s';
 $lang['Creation date: %s'] = 'Skapad datum: %s';
 $lang['Waiting page: %s'] = 'Väntar på sidan: %s';
+$lang['Picture uploaded by %s'] = 'Bild upp laddad av %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'dålig status för användare \"gäst\", default status kommer används Vanligen meddela webmastern..';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administratör, webmaster och speciell användare kan inte använda denna metod';
 $lang['a user use already this mail address'] = 'annan användare använder redan denna e-post';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index 4a6e25350..a9874f64e 100644
--- a/language/tr_TR/common.lang.php
+++ b/language/tr_TR/common.lang.php
@@ -280,6 +280,7 @@ $lang['Category: %s'] = 'Kategori: %s';
 $lang['Picture name: %s'] = 'resim Adı: %s';
 $lang['Creation date: %s'] = 'Yaratma Tarihi: %s';
 $lang['Waiting page: %s'] = 'Beklenen Sayfa: %s';
+$lang['Picture uploaded by %s'] = 'resimi Gönderen %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Kullanıcı için kötü statü "ziyaretçi", varsayılan statü kullanılıyor. Lütfen webmaster\'a bildirin';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Yönetici, webmaster ve özel kullanıcı bu metodu kullanamaz';
 $lang['a user use already this mail address'] = 'bu e-posta adresi başka bir kullanıcı tarafından kullanılmaktadır.';
diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index 91565c7ef..e296673fe 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -325,7 +325,10 @@ $lang['Category: %s'] = 'Đề mục: %s';
 $lang['Picture name: %s'] = 'Tên hình: %s';

 $lang['Creation date: %s'] = 'Ngày gởi: %s';

 $lang['Waiting page: %s'] = 'Trang đợi: %s';

+$lang['Picture uploaded by %s'] = 'Hình được gởi bởi %s';

+// --------- Starting below: New or revised $lang ---- from version 1.7.1

 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status xấu đối với thành viên đăng thuộc nhóm "khách", sử dụng status mặc định. Thông báo ngay cho Quản trị';

+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)

 $lang['Administrator, webmaster and special user cannot use this method'] = 'Quản trị viên và thành viên đặc biệt không thể sử dụng cách này';

 $lang['a user use already this mail address'] = 'đã có thành viên sử dụng địa chỉ email này';

 $lang['Category results for'] = 'Kết quả đề mục cho';

@@ -353,6 +356,7 @@ $lang['group by letters'] = 'phân nhóm theo ký tự';
 $lang['letters'] = 'ký tự';

 $lang['cloud'] = 'mây';

 $lang['Reset to default values'] = 'Thiết lập lại giá trị mặc định';

+// --------- Starting below: New or revised $lang ---- from Colibri (2.1)

 $lang['delete all images from your favorites'] = 'xoá tất cả hình từ danh sách ưa thích';

 $lang['Sent by'] = 'Được gởi bởi';

 $lang['Are you sure?'] = 'Bạn có chắc không?';

diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 2155b2cc6..788b681ad 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -326,7 +326,10 @@ $lang['Category: %s'] = '类别: %s';
 $lang['Picture name: %s'] = '图片名: %s';
 $lang['Creation date: %s'] = '创建日期: %d';
 $lang['Waiting page: %s'] = '等待页面: %s';
+$lang['Picture uploaded by %s'] = '图片上载者 %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = '如果游客反常拥有普通用户才拥有状态，请向网络管理员报告。';
+// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = '管理员, 网管和特定用户不能使用此方法功能';
 $lang['a user use already this mail address'] = '邮箱地址已存在';
 $lang['Category results for'] = '符合查询类结果';