[Wesnoth-cvs-commits] wesnoth data/multiplayer.cfg utils/wmlxgettext

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/11/09 00:34:35

Modified files:
        data           : multiplayer.cfg 

Log message:
        removed one extra space

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/multiplayer.cfg.diff?tr1=1.81&tr2=1.82&r1=text&r2=text

Modified files:
        utils          : wmlxgettext 

Log message:
        oops, do not drop all line-endings allogether !

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/wmlxgettext.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: wesnoth/data/multiplayer.cfg
diff -u wesnoth/data/multiplayer.cfg:1.92 wesnoth/data/multiplayer.cfg:1.93
--- wesnoth/data/multiplayer.cfg:1.92   Sun Oct  3 19:45:03 2004
+++ wesnoth/data/multiplayer.cfg        Fri Oct 15 19:33:34 2004
@@ -89,7 +89,7 @@
        type=Drake Flare
        leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake 
Warrior,Saurian Soothsayer,Saurian Icecaster
        recruit=Drake Burner,Drake Clasher,Drake Glider,Drake 
Fighter,Saurian,Saurian Tribalist
-       terrain_liked=hm
+       terrain_liked=hmd
                [ai]
                
recruitment_pattern=fighter,fighter,fighter,archer,archer,scout,scout
                [/ai]
@@ -170,7 +170,7 @@
        type=Drake Flare
        leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake 
Warrior
        recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter
-       terrain_liked=hm
+       terrain_liked=hmd
                [ai]
                
recruitment_pattern=fighter,fighter,fighter,archer,archer,scout,scout
                [/ai]
@@ -262,7 +262,7 @@
        type=Drake Flameheart
        leader=Drake Flameheart,Inferno Drake,Drake Slasher,Drake 
Gladiator,Drake Warrior,Saurian Soothsayer,Saurian Icecaster
        recruit=Drake Burner,Fire Drake,Drake Clasher,Drake Glider,Drake 
Fighter,Saurian,Saurian Tribalist,Drake Warrior,Drake Flare,Drake Gladiator,Sky 
Drake,Drake Slasher,Saurian Warrior,Saurian Soothsayer,Saurian Icecaster
-       terrain_liked=hm
+       terrain_liked=hmd
                [ai]
                
recruitment_pattern=fighter,fighter,fighter,archer,archer,scout,scout
                [/ai]
Index: wesnoth/utils/wmlxgettext
diff -u wesnoth/utils/wmlxgettext:1.10 wesnoth/utils/wmlxgettext:1.11
--- wesnoth/utils/wmlxgettext:1.10      Tue Nov  9 00:27:46 2004
+++ wesnoth/utils/wmlxgettext   Tue Nov  9 00:34:35 2004
@@ -42,7 +42,7 @@
 
       $translatable = ($1 ne '');
       $_ = $2;
-      if (m/(.*)\r/) { $_ = $1; }
+      if (m/(.*)\r/) { $_ = "$1\n"; }
       $str = $_;
       $line = $.;
 
@@ -62,7 +62,7 @@
 
     } elsif (defined $str) {
       # part of multi-line
-      if (m/(.*)\r/) { $_ = $1; }
+      if (m/(.*)\r/) { $_ = "$1\n"; }
       $str .= $_;
 
     } elsif (m/(\S+)\s*=\s*(.*?)\s*$/) {