From 4286eb48c13b74597b0186fa03849ccd89c47041 Mon Sep 17 00:00:00 2001
From: Criss <criss@piwigo.org>
Date: Fri, 3 Jul 2009 13:51:35 +0000
Subject: [PATCH] bug 0001042 Files fixed

git-svn-id: http://piwigo.org/svn/trunk@3505 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 language/nl_NL/help/configuration.html                  | 2 +-
 plugins/LocalFilesEditor/language/it_IT/plugin.lang.php | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/language/nl_NL/help/configuration.html b/language/nl_NL/help/configuration.html
index ccb2d4d62..02c954c5b 100644
--- a/language/nl_NL/help/configuration.html
+++ b/language/nl_NL/help/configuration.html
@@ -83,7 +83,7 @@ opties overschreven door de gebruikers eigen opties (aanpasbaar in <span class="
 
   <li><strong>Aantal afbeeldingen per rij</strong></li>
 
-  <li><strongAantal afbeeldingen per pagina</strong></li>
+  <li><strong>Aantal afbeeldingen per pagina</strong></li>
 
   <li><strong>aangezichts thema</strong></li>
 
diff --git a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php
index b594ef65f..af3ae20a0 100644
--- a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php
+++ b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php
@@ -51,10 +51,5 @@ $lang['locfiledit_parent_directory'] = 'Directory parente';
 $lang['locfiledit_filename_error'] = 'Caratteri vietati nel nome del file.';
 $lang['locfiledit_file_already_exists'] = 'Il file esiste già.';
 $lang['locfiledit_model_error'] = 'Selezionare un modello.';
-<<<<<<< .courant
 $lang['locfiledit_empty_filename'] = 'Indicate un nome di file.';
-
-=======
-$lang['locfiledit_empty_filename'] = 'Indicate un nome di file.';
->>>>>>> .fusion-droit.r3413
 ?>
\ No newline at end of file