[release-notes/f14: 3/4] l10n: it-IT Boot Various_Servers

[votta luigi]

commit b2c20184dd8bc4f5bc4a70074d7afc6f695962b4
Merge: 178142b... 8e31e4b...
Author: luigi votta <lewis41 at fedoraproject.org>
Date:   Mon Sep 13 22:28:28 2010 +0200

    l10n: it-IT Boot Various_Servers

 it-IT/Boot.po             |    2 +-
 it-IT/Database_Servers.po |    4 ++++
 it-IT/File_Systems.po     |    8 ++++++++
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --cc it-IT/Database_Servers.po
index 5bcd0e1,a7f0fca..6fc7bfd
--- a/it-IT/Database_Servers.po
+++ b/it-IT/Database_Servers.po
@@@ -16,7 -16,7 +16,11 @@@ msgstr "
  #. Tag: title
  #, no-c-format
  msgid "Database Servers"
++<<<<<<< HEAD
 +msgstr "Database Servers"
++=======
+ msgstr "Database Server"
++>>>>>>> it-branch
  
  #. Tag: para
  #, no-c-format
diff --cc it-IT/File_Systems.po
index cc578c2,743a7ad..443894f
--- a/it-IT/File_Systems.po
+++ b/it-IT/File_Systems.po
@@@ -5,7 -5,7 +5,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 0\n"
  "POT-Creation-Date: 2010-09-07T00:34:22\n"
++<<<<<<< HEAD
 +"PO-Revision-Date: 2010-09-13 20:08+0100\n"
++=======
+ "PO-Revision-Date: 2010-09-13 22:16+0100\n"
++>>>>>>> it-branch
  "Last-Translator: luigi votta <lewis41 at fedoraproject.org>\n"
  "Language-Team: None\n"
  "Language: \n"
@@@ -16,7 -16,7 +20,11 @@@
  #. Tag: title
  #, no-c-format
  msgid "File Systems"
++<<<<<<< HEAD
 +msgstr "File Systems"
++=======
+ msgstr "File System"
++>>>>>>> it-branch
  
  #. Tag: para
  #, no-c-format