merge r6345 from branch 2.1 to trunk

git-svn-id: http://piwigo.org/svn/trunk@6346 68402e56-0260-453c-a942-63ccdbb3a9ee

20 files changed, 2 insertions, 20 deletions

diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 8ed00acfc..06b0f6962 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -616,7 +616,6 @@ $lang['ranks'] = 'الترتيب';
 $lang['Drag to re-order'] = 'أسحب لتغيير';
 $lang['Quick Local Synchronization'] = 'فحص سريع للمستجدات';
 $lang['No photo can be deleted'] = 'لا صور يمكن حذفها';
-$lang['Note: Only deletes photos added with pLoader'] = 'pLoader ملاحظة :فقط يمكنك حذف الصورالمحملة عن طريق برنامج';
 $lang['Delete selected photos'] = 'حذف الصورالمختارة';
 $lang['%d photo was deleted'] = ' صورة محذوفة %d';
 $lang['%d photos were deleted'] = ' صور محذوفة %d';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 6c1faab0b..82e19d118 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'hodnocení';
 $lang['Drag to re-order'] = 'Pořadí změníte táhnutím myši';
 $lang['Quick Local Synchronization'] = 'Rychlá místní synchronizace';
 $lang['No photo can be deleted'] = 'Fotografie nemůže být vymazána';
-$lang['Note: Only deletes photos added with pLoader'] = 'Poznámka: odstraní pouze fotografie přidané pomocí pLoaderu';
 $lang['Delete selected photos'] = 'Vymazat vybrané fotografie';
 $lang['%d photo was deleted'] = '%d fotografie vymazána';
 $lang['%d photos were deleted'] = '%d fotografií vymazáno';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index ed33fd2e4..a48584e62 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -615,7 +615,6 @@ $lang['ranks']     =     'Rangerer';
 $lang['Drag to re-order']     =     'Klik-og-træk for at re-order';
 $lang['Quick Local Synchronization']     =     'Quick Lokal synkronisering';
 $lang['No photo can be deleted']     =     'Intet foto kan slettes';
-$lang['Note: Only deletes photos added with pLoader']     =     'Note: Kun billeder tilføjet med pLoader kan slettes';
 $lang['Delete selected photos']     =     'Slet valgte billeder';
 $lang['%d photo was deleted']     =     ' %d billede slettet';
 $lang['%d photos were deleted']     =     ' %d billeder slettet';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 6cc9c4555..118e7740c 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -611,7 +611,6 @@ $lang['ranks'] = 'Reihenfolge';
 $lang['Drag to re-order'] = 'Klicken und Ziehen um eine neue Reihenfolge festzulegen';
 $lang['Quick Local Synchronization'] = 'Schnelle Synchronisierung';
 $lang['No photo can be deleted'] = 'Kein Foto kann gelöscht werden';
-$lang['Note: Only deletes photos added with pLoader'] = 'Bitte beachten: Nur über pLoader hochgeladene Fotos können damit entfernt werden';
 $lang['Delete selected photos'] = 'Lösche ausgewählte Fotos';
 $lang['%d photo was deleted'] = '%d Foto wurde gelöscht';
 $lang['%d photos were deleted'] = '%d Fotos wurden gelöscht';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 990cb98ee..0a54f2f62 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -616,7 +616,7 @@ $lang['Manual order'] = 'Manual order';
 $lang['Drag to re-order'] = "Click-and-drag to re-order";
 $lang['Quick Local Synchronization'] = "Quick Local Synchronization";
 $lang['No photo can be deleted'] = "No photo can be deleted";
-$lang['Note: Only deletes photos added with pLoader'] = "Note: Only photos added with pLoader can be deleted";
+$lang['Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'] = "Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.";
 $lang['Delete selected photos'] = "Delete selected photos";
 $lang['%d photo was deleted'] = "%d photo deleted";
 $lang['%d photos were deleted'] = "%d photos deleted";
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index cbdf7ca2c..c459ef588 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -611,7 +611,6 @@ $lang['ranks'] = 'Filas';
 $lang['Drag to re-order'] = 'Hacer clic deslizar para reorganizar';
 $lang['Quick Local Synchronization'] = 'Sincronización Rápida';
 $lang['No photo can be deleted'] = 'Ninguna foto puede ser suprimida';
-$lang['Note: Only deletes photos added with pLoader'] = 'Nota: Solo las fotos añadidas con pLoader pueden ser suprimidas';
 $lang['Delete selected photos'] = 'Suprimir las fotos';
 $lang['%d photo was deleted'] = '%d foto ha sido suprimida';
 $lang['%d photos were deleted'] = '%d fotos han sido suprimidas';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 5660c786f..a47178f75 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -617,7 +617,7 @@ $lang['Manual order'] = 'Ordre manuel';
 $lang['Drag to re-order'] = "Cliquer-glisser pour ré-organiser";
 $lang['Quick Local Synchronization'] = "Synchronisation Rapide";
 $lang['No photo can be deleted'] = "Aucune photo ne peut être supprimée";
-$lang['Note: Only deletes photos added with pLoader'] = "Note : seules les photos ajoutées via pLoader peuvent être supprimées";
+$lang['Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'] = "Note : Cette suppression des photos ne s'applique pas pour les photos ajoutées à l'aide de la synchronisation (méthode classique par chargement FTP). Pour ces photos, supprimez-les de votre serveur et refaites une synchronisation.";
 $lang['Delete selected photos'] = "Supprimer les photos sélectionnées";
 $lang['%d photo was deleted'] = "%d photo a été supprimée";
 $lang['%d photos were deleted'] = "%d photos ont été supprimées";
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index 4b0cdcb8d..fe54928ad 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -609,7 +609,6 @@ $lang['ranks'] = 'poretci';
 $lang['Drag to re-order'] = 'Povuci za preslagivanje';
 $lang['Quick Local Synchronization'] = 'Brzo Mjesno Usklađivanje';
 $lang['No photo can be deleted'] = 'Nema slike koja se može brisati';
-$lang['Note: Only deletes photos added with pLoader'] = 'Obavjest: Briše samo slike dodane sa pLoader-om';
 $lang['Delete selected photos'] = 'Briši odabrane slike';
 $lang['%d photo was deleted'] = '%d slika je izbrisana';
 $lang['%d photos were deleted'] = '%d slike su izbrisane';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index b9b7bfa2f..cb0ebc1dd 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -612,7 +612,6 @@ $lang['ranks'] = 'Rangok';
 $lang['Drag to re-order'] = 'Húzással átrendezheti';
 $lang['Quick Local Synchronization'] = 'Helyi szinkronizálás';
 $lang['No photo can be deleted'] = 'Nincs törölhető kép';
-$lang['Note: Only deletes photos added with pLoader'] = 'Figyelem: Csak pLoader képet lehet eltávolítani';
 $lang['Delete selected photos'] = 'Kijelölt képek törlése';
 $lang['%d photo was deleted'] = '%d kép törölve';
 $lang['%d photos were deleted'] = '%d kép törölve';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 7adfba97c..0212d19fa 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -617,7 +617,6 @@ $lang['Manual order'] = 'Ordinamento manuale';
 $lang['Drag to re-order'] = 'Clicca e trascina per riorganizzare';
 $lang['Quick Local Synchronization'] = 'Sincronizzazione rapida';
 $lang['No photo can be deleted'] = 'Nessuna foto può essere eliminata';
-$lang['Note: Only deletes photos added with pLoader'] = 'Nota: elimina solo le foto aggiunte con pLoader';
 $lang['Delete selected photos'] = 'Eliminare le foto selezionate';
 $lang['%d photo was deleted'] = '%d foto è stata cancellata';
 $lang['%d photos were deleted'] = '%d foto sono state cancellate';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 9430a364f..5fea91264 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'ランク';
 $lang['Drag to re-order'] = 'ドラッグして並び替え';
 $lang['Quick Local Synchronization'] = 'クイックローカル同期';
 $lang['No photo can be deleted'] = '写真は削除されませんでした。';
-$lang['Note: Only deletes photos added with pLoader'] = '注意: pLoaderに追加された写真のみ削除します。';
 $lang['Delete selected photos'] = '選択した写真を削除する';
 $lang['%d photo was deleted'] = '%d 写真が削除されました。';
 $lang['%d photos were deleted'] = '%d 写真が削除されました。';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index ef92c6296..dbd777651 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -605,7 +605,6 @@ $lang['overrides existing values with empty ones'] = 'overschrijft de bestaande
 $lang['Drag to re-order'] = 'Sleep om volgorde te veranderen';
 $lang['Quick Local Synchronization'] = 'Snelle lokale Synchronisatie';
 $lang['No photo can be deleted'] = 'Geen enkele foto kan verwijderd worden';
-$lang['Note: Only deletes photos added with pLoader'] = 'Noot: Alleen foto\'s die met pLoader geplaatst zijn kunnen verwijderd worden';
 $lang['Delete selected photos'] = 'Verwijder geselecteerde foto\'s';
 $lang['%d photo was deleted'] = '%d foto is verwijderd';
 $lang['%d photos were deleted'] = '%d foto\'s zijn verwijderd';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 6d69b634a..f3bf55640 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'rankingi';
 $lang['Drag to re-order'] = 'Przesuń aby zreorganizować';
 $lang['Quick Local Synchronization'] = 'Szybka synchronizacja lokalna';
 $lang['No photo can be deleted'] = 'Żadne zdjęcie nie zostało usunięte';
-$lang['Note: Only deletes photos added with pLoader'] = 'Info: Usuwa tylko zdjęcia dodane przez pLoader';
 $lang['Delete selected photos'] = 'Usuń zaznaczone zdjęcie';
 $lang['%d photo was deleted'] = '%d zdjęcie zostało usunięte';
 $lang['%d photos were deleted'] = '%d zdjęć zostało usuniętych';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index 4bbe677f4..4ad350603 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'posições (ranks)';
 $lang['Drag to re-order'] = 'Arraste para reordenar';
 $lang['Quick Local Synchronization'] = 'Sincronização Local Rápida';
 $lang['No photo can be deleted'] = 'Nenhuma foto pode ser apagada';
-$lang['Note: Only deletes photos added with pLoader'] = 'Note: O sistema apenas apaga as fotos que foram adicionadas com o pLoader';
 $lang['Delete selected photos'] = 'Apagar as fotos selecionadas';
 $lang['%d photo was deleted'] = '%d foto foi apagada';
 $lang['%d photos were deleted'] = '%d fotos foram apagadas';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 24c8df067..2b5ccd531 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -613,7 +613,6 @@ $lang['ranks'] = 'posições (ranks)';
 $lang['Drag to re-order'] = 'Arraste para reordenar';
 $lang['Quick Local Synchronization'] = 'Sincronização Local Rápida';
 $lang['No photo can be deleted'] = 'Nenhuma foto pode ser apagada';
-$lang['Note: Only deletes photos added with pLoader'] = 'Note: O sistema apenas apaga as fotos que foram adicionadas com o pLoader';
 $lang['Delete selected photos'] = 'Apagar as fotos selecionadas';
 $lang['%d photo was deleted'] = '%d foto foi apagada';
 $lang['%d photos were deleted'] = '%d fotos foram apagadas';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 9127332f7..4c5d3f378 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -612,7 +612,6 @@ $lang['ranks'] = 'порядок';
 $lang['Drag to re-order'] = 'Перетащите чтобы изменить порядок';
 $lang['Quick Local Synchronization'] = 'Быстрая синхронизация';
 $lang['No photo can be deleted'] = 'Нет фото для удаления';
-$lang['Note: Only deletes photos added with pLoader'] = 'Заметьте: Удаление только фото добавленных с помощью pLoader';
 $lang['Delete selected photos'] = 'Удалить выбранные фото';
 $lang['%d photo was deleted'] = '%d фото удалено';
 $lang['%d photos were deleted'] = '%d фото удалено';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index b12c2f92b..9ef820e15 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'poredak';
 $lang['Drag to re-order'] = 'Povuci za preređivanje';
 $lang['Quick Local Synchronization'] = 'Brza Lokalna Sinhronizacija';
 $lang['No photo can be deleted'] = 'Nema slike koja se može brisati';
-$lang['Note: Only deletes photos added with pLoader'] = 'Obaveštenje: Briše samo slike dodate sa pLoader-om';
 $lang['Delete selected photos'] = 'Briši odabrane slike';
 $lang['%d photo was deleted'] = '%d slika je izbrisana';
 $lang['%d photos were deleted'] = '%d slike su izbrisane';
diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 695674163..0006b14af 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -636,7 +636,6 @@ $lang['Drag to re-order'] = 'Drag to re-order';
 $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.';
 $lang['Quick Local Synchronization'] = 'Quick Local Synchronization';
 $lang['No photo can be deleted'] = 'No photo can be deleted';
-$lang['Note: Only deletes photos added with pLoader'] = 'Note: Only deletes photos added with pLoader';
 $lang['Delete selected photos'] = 'Delete selected photos';
 $lang['%d photo was deleted'] = '%d photo was deleted';
 $lang['%d photos were deleted'] = '%d photos were deleted';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 6d9d502d2..ca562f4d7 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -614,7 +614,6 @@ $lang['ranks'] = 'xếp hạng';
 $lang['Drag to re-order'] = 'Kéo rê để sắp xếp lại';

 $lang['Quick Local Synchronization'] = 'Đồng bộ hóa cục bộ nhanh';

 $lang['No photo can be deleted'] = 'Không có hình nào có thể bị xóa';

-$lang['Note: Only deletes photos added with pLoader'] = 'Chú ý: Chỉ xóa những hình mà được thêm vào bằng pLoader';

 $lang['Delete selected photos'] = 'Xóa các hình được chọn';

 $lang['%d photo was deleted'] = '%d hình đã được xóa';

 $lang['%d photos were deleted'] = 'Có %d hình đã được xóa';

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index c82563672..800b9b6d7 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -613,7 +613,6 @@ $lang['ranks'] = '顺序';
 $lang['Drag to re-order'] = '拖放进行排序';
 $lang['Quick Local Synchronization'] = '快速同步';
 $lang['No photo can be deleted'] = '没有图片可以删除';
-$lang['Note: Only deletes photos added with pLoader'] = '注意: 只有通过pLoader上传的图片才能被删除';
 $lang['Delete selected photos'] = '删除图片';
 $lang['%d photo was deleted'] = '%d 图片被删除';
 $lang['%d photos were deleted'] = '%d 图片被删除';