From 811923c0d48db15f1afd1998b157ab7fb708eedf Mon Sep 17 00:00:00 2001 From: riopwg Date: Fri, 12 Jun 2009 11:40:54 +0000 Subject: 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 --- plugins/LocalFilesEditor/language/it_IT/plugin.lang.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins') 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 -- cgit v1.2.3