Author: espreon
Date: Wed Mar 2 22:16:07 2011
New Revision: 48713
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48713&view=rev
Log:
Merged duplicate domains.
Modified:
trunk/utils/pofix.py
Modified: trunk/utils/pofix.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/pofix.py?rev=48713&r1=48712&r2=48713&view=diff
==============================================================================
--- trunk/utils/pofix.py (original)
+++ trunk/utils/pofix.py Wed Mar 2 22:16:07 2011
@@ -578,6 +578,64 @@
# conversion added in 1.9.0-svn
("I ain't charging gold â", "I ainât charging gold â"),
("'T'ain't safe", "âTâainât safe"),
+
+("author of Wesnoth's troubles.", "author of Wesnothâs troubles."),
+("Aye, we'll help ye, for", "Aye, weâll help ye, for"),
+("by the orcs fa' sure!", "by the orcs faâ sure!"),
+("c'n stop runnin'...", "cân stop runninâ..."),
+("can get to Weld'n an' all so I", "can get to Weldân anâ all so I"),
+("can't get across. It'll help you to", "canât get across. Itâll help you
to"),
+("caves for centuries. We'll no' be scattered now", "caves for centuries.
Weâll noâ be scattered now"),
+("Commander of the King's Horse. And take", "Commander of the Kingâs Horse.
And take"),
+("Deal. I c'n blow'er up once I", "Deal. I cân blowâer up once I"),
+("go north-east. I'll go north-west.", "go north-east. Iâll go north-west."),
+("Gweddry's men retreated swiftly", "Gweddryâs men retreated swiftly"),
+("Gweddry, I don't think you should", "Gweddry, I donât think you should"),
+("have crossed. Now let's see if we", "have crossed. Now letâs see if we"),
+("He says: 'Well done; you have", "He says: âWell done; you have"),
+("He will reach Mal-Ravanal's capital, and I", "He will reach Mal-Ravanalâs
capital, and I"),
+("his terms? I won't accept anything obviously", "his terms? I wonât accept
anything obviously"),
+("I'll be followin' yah from now", "Iâll be followinâ yah from now"),
+("I'm an enginea'. I s'pect you'll have a need", "Iâm an engineaâ. I
sâpect youâll have a need"),
+("It doesn't matter anyway. The", "It doesnât matter anyway. The"),
+("It doesn't matter. They are", "It doesnât matter. They are"),
+("look impassable. I don't think we will", "look impassable. I donât think
we will"),
+("lord's hordes at dawn", "lordâs hordes at dawn"),
+("may know the undead's weakness.", "may know the undeadâs weakness."),
+("My clan ha' lived in these", "My clan haâ lived in these"),
+("my eq'pment is. But ev'ryone not ov'r theah on that", "my eqâpment is. But
evâryone not ovâr theah on that"),
+("no refuge for Gweddry's weary men, and", "no refuge for Gweddryâs weary
men, and"),
+("No, I don't think so. I", "No, I donât think so. I"),
+("not defeat my Lord's minions, it was", "not defeat my Lordâs minions, it
was"),
+("point north of Glyn's Forest. If we", "point north of Glynâs Forest. If
we"),
+("seems, well merited. Mal-Ravanal's", "seems, well merited. Mal-Ravanalâs"),
+("serve in my Master's undead hordes!", "serve in my Masterâs undead
hordes!"),
+("services. I bet you're", "services. I bet youâre"),
+("several weeks, and Gweddry's men started to", "several weeks, and
Gweddryâs men started to"),
+("The Bitter Swamp's ill reputation is,", "The Bitter Swampâs ill reputation
is,"),
+("the fate of Gweddry's band, but all", "the fate of Gweddryâs band, but
all"),
+("the men of Gweddry's troop that they", "the men of Gweddryâs troop that
they"),
+("These people won't listen to reason,", "These people wonât listen to
reason,"),
+("they can't escape until our", "they canât escape until our"),
+("this river. Now let's go!", "this river. Now letâs go!"),
+("those orcs are chasin' you, and if", "those orcs are chasinâ you, and if"),
+("to keep the Crown's", "to keep the Crownâs"),
+("to know what you're talking about... but,", "to know what youâre talking
about... but,"),
+("to that signpost ov'r dere. Thatâs where", "to that signpost ovâr dere.
Thatâs where"),
+("undead. But we can't help you until", "undead. But we canât help you
until"),
+("undead. âTâainât safe 'round 'ere!", "undead. âTâainât safe
âround âere!"),
+("up that bridge ov'r theah.", "up that bridge ovâr theah."),
+("Very well, we'll protect you from", "Very well, weâll protect you from"),
+("We didn't capture enough of", "We didnât capture enough of"),
+("We're in the land", "Weâre in the land"),
+("well once the King's forces arrived. There", "well once the Kingâs forces
arrived. There"),
+("Well, we didn't have to blow", "Well, we didnât have to blow"),
+("when it blows w'll", "when it blows wâll"),
+("Why don't we see if", "Why donât we see if"),
+("won't be able to", "wonât be able to"),
+("work yet complete. Mal-Ravanal's main host has", "work yet complete.
Mal-Ravanalâs main host has"),
+("year of Konrad II's reign, and there", "year of Konrad IIâs reign, and
there"),
+("your name.'", "your name.â"),
),
@@ -3063,66 +3121,6 @@
# Simons Mith, 23/08/2010, based on build 45968
# Also about twelve new pairs of <i> tags, marked with comments
# From here downwards to next comment block...
-
-"wesnoth-ei" : (
-("author of Wesnoth's troubles.", "author of Wesnothâs troubles."),
-("Aye, we'll help ye, for", "Aye, weâll help ye, for"),
-("by the orcs fa' sure!", "by the orcs faâ sure!"),
-("c'n stop runnin'...", "cân stop runninâ..."),
-("can get to Weld'n an' all so I", "can get to Weldân anâ all so I"),
-("can't get across. It'll help you to", "canât get across. Itâll help you
to"),
-("caves for centuries. We'll no' be scattered now", "caves for centuries.
Weâll noâ be scattered now"),
-("Commander of the King's Horse. And take", "Commander of the Kingâs Horse.
And take"),
-("Deal. I c'n blow'er up once I", "Deal. I cân blowâer up once I"),
-("go north-east. I'll go north-west.", "go north-east. Iâll go north-west."),
-("Gweddry's men retreated swiftly", "Gweddryâs men retreated swiftly"),
-("Gweddry, I don't think you should", "Gweddry, I donât think you should"),
-("have crossed. Now let's see if we", "have crossed. Now letâs see if we"),
-("He says: 'Well done; you have", "He says: âWell done; you have"),
-("He will reach Mal-Ravanal's capital, and I", "He will reach Mal-Ravanalâs
capital, and I"),
-("his terms? I won't accept anything obviously", "his terms? I wonât accept
anything obviously"),
-("I'll be followin' yah from now", "Iâll be followinâ yah from now"),
-("I'm an enginea'. I s'pect you'll have a need", "Iâm an engineaâ. I
sâpect youâll have a need"),
-("It doesn't matter anyway. The", "It doesnât matter anyway. The"),
-("It doesn't matter. They are", "It doesnât matter. They are"),
-("look impassable. I don't think we will", "look impassable. I donât think
we will"),
-("lord's hordes at dawn", "lordâs hordes at dawn"),
-("may know the undead's weakness.", "may know the undeadâs weakness."),
-("My clan ha' lived in these", "My clan haâ lived in these"),
-("my eq'pment is. But ev'ryone not ov'r theah on that", "my eqâpment is. But
evâryone not ovâr theah on that"),
-("no refuge for Gweddry's weary men, and", "no refuge for Gweddryâs weary
men, and"),
-("No, I don't think so. I", "No, I donât think so. I"),
-("not defeat my Lord's minions, it was", "not defeat my Lordâs minions, it
was"),
-("point north of Glyn's Forest. If we", "point north of Glynâs Forest. If
we"),
-("seems, well merited. Mal-Ravanal's", "seems, well merited. Mal-Ravanalâs"),
-("serve in my Master's undead hordes!", "serve in my Masterâs undead
hordes!"),
-("services. I bet you're", "services. I bet youâre"),
-("several weeks, and Gweddry's men started to", "several weeks, and
Gweddryâs men started to"),
-("The Bitter Swamp's ill reputation is,", "The Bitter Swampâs ill reputation
is,"),
-("the fate of Gweddry's band, but all", "the fate of Gweddryâs band, but
all"),
-("the men of Gweddry's troop that they", "the men of Gweddryâs troop that
they"),
-("These people won't listen to reason,", "These people wonât listen to
reason,"),
-("they can't escape until our", "they canât escape until our"),
-("this river. Now let's go!", "this river. Now letâs go!"),
-("those orcs are chasin' you, and if", "those orcs are chasinâ you, and if"),
-("to keep the Crown's", "to keep the Crownâs"),
-("to know what you're talking about... but,", "to know what youâre talking
about... but,"),
-("to that signpost ov'r dere. Thatâs where", "to that signpost ovâr dere.
Thatâs where"),
-("undead. But we can't help you until", "undead. But we canât help you
until"),
-("undead. âTâainât safe 'round 'ere!", "undead. âTâainât safe
âround âere!"),
-("up that bridge ov'r theah.", "up that bridge ovâr theah."),
-("Very well, we'll protect you from", "Very well, weâll protect you from"),
-("We didn't capture enough of", "We didnât capture enough of"),
-("We're in the land", "Weâre in the land"),
-("well once the King's forces arrived. There", "well once the Kingâs forces
arrived. There"),
-("Well, we didn't have to blow", "Well, we didnât have to blow"),
-("when it blows w'll", "when it blows wâll"),
-("Why don't we see if", "Why donât we see if"),
-("won't be able to", "wonât be able to"),
-("work yet complete. Mal-Ravanal's main host has", "work yet complete.
Mal-Ravanalâs main host has"),
-("year of Konrad II's reign, and there", "year of Konrad IIâs reign, and
there"),
-("your name.'", "your name.â"),
-),
"wesnoth-tutorial" : (
("<big>You have selected Li'sar.</big>", "<big>You have selected
Liâsar.</big>"),
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
