merge r6402 from trunk

removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page

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

20 files changed, 2 insertions, 22 deletions

diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 06b0f6962..323c4bf90 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'تنص�
 $lang['Check for upgrade failed for unknown reasons.'] = 'لم يتم التحدث لاسباب غير معروفه.';
 $lang['Check for upgrade'] = 'التأكد من التحديثات';
 $lang['Comments for all'] = 'يسمح للجميع بالتعليق دون استثناء و دون طائفية :)';
-$lang['Controversy'] = 'التعليقات';
 $lang['Current name'] = 'الاسم الحالي';
 $lang['Database'] = 'قاعدة البيانات';
 $lang['Deactivate'] = 'تعطيل';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 82e19d118..9147387de 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -72,7 +72,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Položk
 $lang['Check for upgrade failed for unknown reasons.'] = 'Zjištění možnosti aktualizace se nezdařilo';
 $lang['Check for upgrade'] = 'Zjistit možnost aktualizace';
 $lang['Comments for all'] = 'Komentáře pro všechny';
-$lang['Controversy'] = 'Kontroverze';
 $lang['Current name'] = 'Současný název';
 $lang['Database'] = 'Databáze';
 $lang['Deactivate'] = 'Deaktivovat';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index a48584e62..6209105bc 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s']     =
 $lang['Check for upgrade failed for unknown reasons.']     =     'Check for opgradering mislykkedes af ukendte årsager.';
 $lang['Check for upgrade'] = 'Tjek efter opgradering';
 $lang['Comments for all']     =     'Kommentarer til alle';
-$lang['Controversy'] = 'Kontrovers';
 $lang['Current name']     =     'Nuværende navn';
 $lang['Database']     =     'Database';
 $lang['Deactivate']     =     'Deaktiver';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 118e7740c..39c041413 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Kategor
 $lang['Check for upgrade failed for unknown reasons.'] = 'Suche nach einem Upgrade nicht möglich.';
 $lang['Check for upgrade'] = 'Prüfe ob eine neue Version der Bildergalerie verfügbar ist.';
 $lang['Comments for all'] = 'Kommentare für alle erlaubt';
-$lang['Controversy'] = 'Abweichung';
 $lang['Current name'] = 'Derzeitiger Name';
 $lang['Database'] = 'Datenbank';
 $lang['Deactivate'] = 'Deaktivieren';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 3b4b5643f..630fa9dda 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = "Categor
 $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons.";
 $lang['Check for upgrade'] = "Check for upgrade";
 $lang['Comments for all'] = "Comments for all";
-$lang['Controversy'] = "Controversy";
 $lang['Current name'] = "Current name";
 $lang['Database'] = "Database";
 $lang['Deactivate'] = "Deactivate";
@@ -769,4 +768,4 @@ $lang['Add another set of photos'] = 'Add another set of photos';
 $lang['Order of menubar items has been updated successfully.'] = 'Order of menubar items has been updated successfully.';
 $lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated';
 $lang['Pending Comments'] = 'Pending Comments';
-?>
+?>
\ No newline at end of file
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index c459ef588..f6fc0ed33 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Los ele
 $lang['Check for upgrade failed for unknown reasons.'] = 'La comprobación de la última versión sobre el servidor fue suspendida por una razón desconocida.';
 $lang['Check for upgrade'] = 'Última versión';
 $lang['Comments for all'] = 'Comentarios para todos';
-$lang['Controversy'] = 'Controversia';
 $lang['Current name'] = 'Nombre corriente';
 $lang['Database'] = 'Base de datos';
 $lang['Deactivate'] = 'Desactivada';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index a47178f75..06186c2c7 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = "Les él
 $lang['Check for upgrade failed for unknown reasons.'] = "La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.";
 $lang['Check for upgrade'] = "Dernière version ?";
 $lang['Comments for all'] = "Commentaires pour tous";
-$lang['Controversy'] = "Conflit";
 $lang['Current name'] = "Nom courant";
 $lang['Database'] = "Base de données";
 $lang['Deactivate'] = "Désactiver";
@@ -773,4 +772,4 @@ $lang['Add another set of photos'] = 'Ajouter d\'autres photos';
 $lang['Order of menubar items has been updated successfully.'] = 'L\'ordre des éléments du menu a été mis à jour avec succès.';
 $lang['This theme was not designed to be directly activated'] = 'Ce thème n\'est pas conçu pour être activé directement';
 $lang['Pending Comments'] = 'Commentaires en attente';
-?>
+?>
\ No newline at end of file
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index fe54928ad..f666d192f 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Stavke
 $lang['Check for upgrade failed for unknown reasons.'] = 'Provjera nadogradnje neuspješna iz nepoznatog razloga.';
 $lang['Check for upgrade'] = 'Provjera nadogradnje';
 $lang['Comments for all'] = 'Komentari za sve';
-$lang['Controversy'] = 'Osporavanja';
 $lang['Current name'] = 'Trenutni naziv';
 $lang['Database'] = 'Baza podataka';
 $lang['Deactivate'] = 'Isključi';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index cb0ebc1dd..0bccc57a8 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'A kateg
 $lang['Check for upgrade failed for unknown reasons.'] = 'A program frissítése ismeretlen okból nem sikerült.';
 $lang['Check for upgrade'] = 'Frissítés keresése';
 $lang['Comments for all'] = 'Bárki hozzászólhat';
-$lang['Controversy'] = 'Szórás';
 $lang['Current name'] = 'Név';
 $lang['Database'] = 'Adatbázis';
 $lang['Deactivate'] = 'Kikapcsolás';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 3b24dd050..85b094d8e 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Gli ele
 $lang['Check for upgrade failed for unknown reasons.'] = 'La verifica dell\'ultima versione sul server è fallita per le ragioni sconosciute.';
 $lang['Check for upgrade'] = 'Ultima versione ?';
 $lang['Comments for all'] = 'Commenti per tutti';
-$lang['Controversy'] = 'Controversia';
 $lang['Current name'] = 'Nome attuale';
 $lang['Database'] = 'Database';
 $lang['Deactivate'] = 'Disattivare';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 5fea91264..0710f5fcf 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = '以下�
 $lang['Check for upgrade failed for unknown reasons.'] = '不明な理由により、アップグレードのチェックが失敗しました。';
 $lang['Check for upgrade'] = 'アップグレードをチェックする';
 $lang['Comments for all'] = 'すべてのユーザにコメントを許可する';
-$lang['Controversy'] = '論争';
 $lang['Current name'] = '現在の名称';
 $lang['Database'] = 'データベース';
 $lang['Deactivate'] = '無効化';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index dbd777651..9b2e0f5aa 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Categor
 $lang['Check for upgrade failed for unknown reasons.'] = 'Upgradecontrole is door onbekende reden niet (goed) uitgevoerd.';
 $lang['Check for upgrade'] = 'Upgradecontrole';
 $lang['Comments for all'] = 'Iedereen mag commentaar geven (ook gasten)';
-$lang['Controversy'] = 'Controversieel';
 $lang['Current name'] = 'Huidige naam';
 $lang['Database'] = 'Database';
 $lang['Deactivate'] = 'Deactiveer';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index f3bf55640..59470e675 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Element
 $lang['Check for upgrade failed for unknown reasons.'] = 'Sprawdzenie aktualizacji nie powiodło się z nieznanych powodów.';
 $lang['Check for upgrade'] = 'Sprawdź aktualizacje';
 $lang['Comments for all'] = 'Komentarze dla wszystkich';
-$lang['Controversy'] = 'Kontorversyjność';
 $lang['Current name'] = 'Bieżąca nazwa';
 $lang['Database'] = 'Baza danych';
 $lang['Deactivate'] = 'Deaktywuj';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index 4ad350603..a4b089c3a 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Itens d
 $lang['Check for upgrade failed for unknown reasons.'] = 'A checagem por atualização falhou por razões desconhecidas.';
 $lang['Check for upgrade'] = 'Checar por atualização';
 $lang['Comments for all'] = 'Comentários para todos';
-$lang['Controversy'] = 'Controvérsia';
 $lang['Current name'] = 'Nome atual';
 $lang['Database'] = 'Base de dados';
 $lang['Deactivate'] = 'Desativar';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 2b5ccd531..acf9f1a16 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Element
 $lang['Check for upgrade failed for unknown reasons.'] = 'A procura de atualização falhou por razões desconhecidas.';
 $lang['Check for upgrade'] = 'procurar por atualização';
 $lang['Comments for all'] = 'Comentários para todos';
-$lang['Controversy'] = 'Controvérsia';
 $lang['Current name'] = 'Nome atual';
 $lang['Database'] = 'Base de dados';
 $lang['Deactivate'] = 'Desativar';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 4c5d3f378..e20f36c2b 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Фот�
 $lang['Check for upgrade failed for unknown reasons.'] = 'Проверка обновлений не удалась по неизвестным причинам.';
 $lang['Check for upgrade'] = 'Проверить обновления';
 $lang['Comments for all'] = 'Комментарии для всех';
-$lang['Controversy'] = 'Противоречие';
 $lang['Current name'] = 'Текущее название';
 $lang['Database'] = 'База данных';
 $lang['Deactivate'] = 'Выключить';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index 9ef820e15..92cc3ea2d 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Element
 $lang['Check for upgrade failed for unknown reasons.'] = 'Provera nadogradnje neuspešna iz nepoznatog razloga.';
 $lang['Check for upgrade'] = 'Provera nadogradnje';
 $lang['Comments for all'] = 'Komentari za sve';
-$lang['Controversy'] = 'Osporavanja';
 $lang['Current name'] = 'Trenutni naziv';
 $lang['Database'] = 'Baza podataka';
 $lang['Deactivate'] = 'Isključi';
diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 0006b14af..ffd91d32e 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -70,7 +70,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Categor
 $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
 $lang['Check for upgrade'] = 'Check for upgrade';
 $lang['Comments for all'] = 'Comments for all';
-$lang['Controversy'] = 'Controversy';
 $lang['Current name'] = 'Current name';
 $lang['Database'] = 'Database';
 $lang['Deactivate'] = 'Deactivate';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index ca562f4d7..70e80606f 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -70,7 +70,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Các th
 $lang['Check for upgrade failed for unknown reasons.'] = 'Quá trình dò tìm phiên bản nâng cấp bị lỗi, không xác định được nguyên nhân.';

 $lang['Check for upgrade'] = 'Dò tìm phiên bản mới';

 $lang['Comments for all'] = 'Cho mọi đối tượng được phép gởi bình luận';

-$lang['Controversy'] = 'Tranh luận';

 $lang['Current name'] = 'Tên hiện tại';

 $lang['Database'] = 'Cơ sở dữ liệu';

 $lang['Deactivate'] = 'Bỏ kích hoạt';

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 800b9b6d7..279f72775 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = '本类�
 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因导致更新检测失败.';
 $lang['Check for upgrade'] = '检测更新';
 $lang['Comments for all'] = '对所有成员进行评论';
-$lang['Controversy'] = '辩论';
 $lang['Current name'] = '现用名';
 $lang['Database'] = '数据库';
 $lang['Deactivate'] = '注销';