diff options
| author | Criss <criss@piwigo.org> | 2009-07-03 13:51:35 +0000 |
|---|---|---|
| committer | Criss <criss@piwigo.org> | 2009-07-03 13:51:35 +0000 |
| commit | 4286eb48c13b74597b0186fa03849ccd89c47041 (patch) | |
| tree | fd7569d03b58d59e6bac3b7e0b257dc1dc6bc6f4 | |
| parent | 1bc5573c64a8dcb1d94b98746dd236b4ce72b85d (diff) | |
bug 0001042
Files fixed
git-svn-id: http://piwigo.org/svn/trunk@3505 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | language/nl_NL/help/configuration.html | 2 | ||||
| -rw-r--r-- | plugins/LocalFilesEditor/language/it_IT/plugin.lang.php | 5 |
2 files changed, 1 insertions, 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 |