RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 11-May-2011 09:51:44 Branch: HEAD Handle: 2011051107514300 Modified files: rpm/po fi.po Log: fix botched po merge Summary: Revision Changes Path 1.492 +0 -12 rpm/po/fi.po ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/po/fi.po ============================================================================ $ cvs diff -u -r1.491 -r1.492 fi.po --- rpm/po/fi.po 29 Mar 2011 08:02:28 -0000 1.491 +++ rpm/po/fi.po 11 May 2011 07:51:43 -0000 1.492 @@ -8,27 +8,15 @@ msgstr "" "Project-Id-Version: rpm 5.3.2\n" "Report-Msgid-Bugs-To: <rpm-de...@rpm5.org>\n" -<<<<<<< fi.po -"POT-Creation-Date: 2010-12-25 11:22-0500\n" -"PO-Revision-Date: 1998-05-02 21:41:47-0400\n" -"Last-Translator: Raimo Koski <rko...@pp.weppi.fi>\n" -"Language-Team: Finnish <li...@sot.com>\n" -======= "POT-Creation-Date: 2011-02-27 13:06-0500\n" "PO-Revision-Date: 2011-02-27 19:37+0200\n" "Last-Translator: Jorma Karvonen <karvonen.jo...@gmail.com>\n" "Language-Team: Finnish <translation-team...@lists.sourceforge.net>\n" -"Language: fi\n" ->>>>>>> 1.490 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -<<<<<<< fi.po "Language: fi\n" -======= "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: KBabel 1.11.2\n" ->>>>>>> 1.490 #: build.c:45 msgid "Failed build dependencies" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org