poldek: poldek/install/conflicts.c, poldek/po/de.po, poldek/po/pl....

[twittner]

Author: twittner                     Date: Sat Dec 22 22:11:49 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- typo (withx -> with)

---- Files affected:
poldek/poldek/install:
   conflicts.c (1.8 -> 1.9) 
poldek/poldek/po:
   de.po (1.34 -> 1.35) , pl.po (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: poldek/poldek/install/conflicts.c
diff -u poldek/poldek/install/conflicts.c:1.8 poldek/poldek/install/conflicts.c:1.9
--- poldek/poldek/install/conflicts.c:1.8	Sun Jul  8 18:45:38 2007
+++ poldek/poldek/install/conflicts.c	Sat Dec 22 23:11:44 2007
@@ -274,7 +274,7 @@
                 continue;
             
             if (pkg_is_marked(ictx->ts->pms, cpkg->pkg)) {
-                logn(LOGERR, _("%s conflicts withx %s"), pkg_id(pkg),
+                logn(LOGERR, _("%s conflicts with %s"), pkg_id(pkg),
                      pkg_id(cpkg->pkg));
                 ictx->nerr_cnfl++;
                 ncnfl++;

================================================================
Index: poldek/poldek/po/de.po
diff -u poldek/poldek/po/de.po:1.34 poldek/poldek/po/de.po:1.35
--- poldek/poldek/po/de.po:1.34	Tue Jul 17 16:23:10 2007
+++ poldek/poldek/po/de.po	Sat Dec 22 23:11:44 2007
@@ -1228,7 +1228,7 @@
 
 #: install/conflicts.c:273
 #, fuzzy, c-format
-msgid "%s conflicts withx %s"
+msgid "%s conflicts with %s"
 msgstr "'%s' kollidiert mit '%s'"
 
 #: install/icaps.c:82

================================================================
Index: poldek/poldek/po/pl.po
diff -u poldek/poldek/po/pl.po:1.59 poldek/poldek/po/pl.po:1.60
--- poldek/poldek/po/pl.po:1.59	Sun Sep  2 17:28:11 2007
+++ poldek/poldek/po/pl.po	Sat Dec 22 23:11:44 2007
@@ -1188,7 +1188,7 @@
 
 #: install/conflicts.c:273
 #, fuzzy, c-format
-msgid "%s conflicts withx %s"
+msgid "%s conflicts with %s"
 msgstr "%s jest w konflicie z %s"
 
 #: install/icaps.c:82
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install/conflicts.c?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/po/de.po?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/po/pl.po?r1=1.59&r2=1.60&f=u