Re: [PATCH] Re: bug

[Milan Babuskov]

Neil Mitchell wrote:
> > I tried, but diff just got crazy and gave me output like the two files
> > are completely different (- on each line of original, and + on each of
> > my file.... you can try it yourself). I don't understand why that is
> > happening.
> >
> > I used jEdit to get regular diff for files, so you can see what is
> > changed (not much):
>
>
> I have had this a few times with Pingu's, and what I narrowed it down to was
> that some files in the CVS have trailing spaces at the end of lines, and
> some editors (like TextPad which I use) automatically strip these trailing
> spaces. The makes every line appear to have changed in the diff.
>
> Neil

You are right. I just found the solution to this, diff has -b option to 
ignore whitespace differences.

So I have now done: cvs diff -b -u ... and got the right reslut (see 
attachment).

--
Milan Babuskov
http://fbexport.sourceforge.net

Index: Games/Pingus/po/sr.po
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/po/sr.po,v
retrieving revision 1.3
diff -b -u -r1.3 sr.po
--- Games/Pingus/po/sr.po       15 Apr 2003 07:29:34 -0000      1.3
+++ Games/Pingus/po/sr.po       15 Apr 2003 10:42:04 -0000
@@ -100,7 +100,7 @@
 
 #: src/editor/editor_help_screen.cxx:38
 msgid "Editor Helpscreen (hide with F1)"
-msgstr ""
+msgstr "Pomoc za editor (sakrij sa F1)"
 
 #: src/editor/editor_help_screen.cxx:45
 msgid "F1 - show/hide this help screen"
@@ -719,7 +719,7 @@
 
 #: src/pingus_main.cxx:305
 msgid "Warning: Larger resolution than 800x600 will result in visual problems"
-msgstr ""
+msgstr "Upozorenje: Rezolucije vece od 800x600 mogu da izazovu vizuelne 
probleme"
 
 #: src/pingus_main.cxx:482
 msgid "Unknow char: "
@@ -831,7 +831,7 @@
 
 #: src/pingus_main.cxx:518
 msgid "input, pathmgr"
-msgstr ""
+msgstr "kontrole, putanje"
 
 #: src/pingus_main.cxx:519
 msgid "Skip at least N frames, larger values speed the game up"
@@ -883,11 +883,11 @@
 
 #: src/pingus_main.cxx:535
 msgid "Disable sound"
-msgstr "Omoguci zvuk"
+msgstr "Onemoguci zvuk"
 
 #: src/pingus_main.cxx:536
 msgid "Disable music"
-msgstr "Omoguci muziku"
+msgstr "Onemoguci muziku"
 
 #: src/pingus_main.cxx:711
 msgid "clanVorbis support:           ok"