diff options
| author | riopwg <riopwg@piwigo.org> | 2009-06-12 11:40:54 +0000 |
|---|---|---|
| committer | riopwg <riopwg@piwigo.org> | 2009-06-12 11:40:54 +0000 |
| commit | 811923c0d48db15f1afd1998b157ab7fb708eedf (patch) | |
| tree | 64efc948b965f90dde1c2f3b4c5ce5a4ae9d2023 | |
| parent | 1e8ae9e88b0b2c3959ae8b64343c1f5edc1b4fec (diff) | |
merge r3413 from branch 2.0 to trunk
Update lang IT
git-svn-id: http://piwigo.org/svn/trunk@3414 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | plugins/LocalFilesEditor/language/it_IT/plugin.lang.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php index 83fe3a7e4..b594ef65f 100644 --- a/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php +++ b/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php @@ -51,6 +51,10 @@ $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 |