[release-notes/f14: 2/2] Merge branch 'it-branch' into f14
votta luigi
lewis41 at fedoraproject.org
Wed Sep 15 14:30:07 UTC 2010
commit 0f8852051fc257d75e577aac15e3e93f4c7cbb9e
Merge: ad2b86a... 16492e5...
Author: luigi votta <lewis41 at fedoraproject.org>
Date: Wed Sep 15 16:30:36 2010 +0200
Merge branch 'it-branch' into f14
Conflicts:
it-IT/Embedded_Development.po
it-IT/CommonBugs.po | 54 ------
it-IT/Devel-Embedded.po | 365 -------------------------------------
it-IT/Devel-Languages.po | 48 -----
it-IT/Embedded_Development.po | 4 +-
it-IT/Scientific_and_Technical.po | 86 +++++-----
5 files changed, 44 insertions(+), 513 deletions(-)
---
diff --cc it-IT/Embedded_Development.po
index cf1b4a5,f3cc464..d6daee9
--- a/it-IT/Embedded_Development.po
+++ b/it-IT/Embedded_Development.po
@@@ -4,8 -4,8 +4,6 @@@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
- "POT-Creation-Date: 2010-09-15T03:40:02\n"
- "PO-Revision-Date: 2010-09-14 19:38+0100\n"
-"POT-Creation-Date: 2010-09-12T03:40:16\n"
-"PO-Revision-Date: 2010-09-15 12:32+0100\n"
"Last-Translator: luigi votta <lewis41 at fedoraproject.org>\n"
"Language-Team: None\n"
"Language: \n"
More information about the docs-commits
mailing list