nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge a culo

Browse source
This commit is contained in:
Guido Serra aka Zeph 2010-09-23 20:55:57 +02:00
parent 53cda256e2
commit c889fcb592
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/locales/it.yml
View file

@ -3,20 +3,8 @@
# the COPYRIGHT file.
<<<<<<< HEAD
# Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
#
# 1st DRAFT of the italian translation
# 09/2010 Guido Serra aka Zeph <zeph@fsfe.org>
it:
hello: "Ciao Mondo!"
=======
# Sample localization file for Italian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
it:
hello: "Ciao Mondo"
>>>>>>> af91eb51b4ff8d001bbdceba4b4e9e45db498190