Changeset 3414


Ignore:
Timestamp:
06/12/09 13:40:54 (10 years ago)
Author:
riopwg
Message:

merge r3413 from branch 2.0 to trunk
Update lang IT

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php

    r3342 r3414  
    5252$lang['locfiledit_file_already_exists'] = 'Il file esiste già.'; 
    5353$lang['locfiledit_model_error'] = 'Selezionare un modello.'; 
     54<<<<<<< .courant 
    5455$lang['locfiledit_empty_filename'] = 'Indicate un nome di file.'; 
    5556 
     57======= 
     58$lang['locfiledit_empty_filename'] = 'Indicate un nome di file.'; 
     59>>>>>>> .fusion-droit.r3413 
    5660?> 
Note: See TracChangeset for help on using the changeset viewer.