Fixed conversion rules;

commented out the hyphen-minus to Unicode minus conversions for now.

utils/pofix.py

@@ -32,18 +32,20 @@
 stringfixes = {
 
 "wesnoth" : (
+# Don't bother yet; the result will be em dashes instead...
+# Convert hyphen-minuses that are being used as minus signs
+# to the Unicode minus sign
+#("-25%", "\xe2\x88\x9225%"),
+#("-1%", "\xe2\x88\x921%"),
+#("-100%", "\xe2\x88\x92100%"),
+
 # Convert makeshift dashes:
 ("- - -", "\xe2\x80\x94"),
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
-
-# Convert hyphen-minuses that are being used as minus signs
-# to the Unicode minus sign
-("-25", "\xe2\x88\x9225"),
-("-1", "\xe2\x88\x921"),
 ),
 
 "wesnoth-aoi" : (
@@ -52,7 +54,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -62,7 +64,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -72,7 +74,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -82,7 +84,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -92,12 +94,12 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 
 
 # aint -> ain't
-("aint", "ain't"),
+("I aint charging", "I ain't charging"),
 ),
 
 "wesnoth-httt" : (
@@ -106,7 +108,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -116,20 +118,30 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
 "wesnoth-manual" : (
 ),
 
+"wesnoth-multiplayer" : (
+# Convert makeshift dashes
+("- - -", "\xe2\x80\x94"),
+("- -", "\xe2\x80\x94"),
+("---", "\xe2\x80\x94"),
+("--", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
+("- ", "\xe2\x80\x94 "),
+),
+
 "wesnoth-nr" : (
 # Convert makeshift dashes:
 ("- - -", "\xe2\x80\x94"),
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -139,7 +151,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -149,7 +161,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -159,7 +171,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -169,7 +181,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -179,7 +191,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -189,7 +201,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -199,7 +211,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -209,7 +221,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -219,7 +231,7 @@ stringfixes = {
 ("- -", "\xe2\x80\x94"),
 ("---", "\xe2\x80\x94"),
 ("--", "\xe2\x80\x94"),
-(" -", "\xe2\x80\x94"),
+(" -", " \xe2\x80\x94"),
 ("- ", "\xe2\x80\x94 "),
 ),
 
@@ -228,8 +240,6 @@ stringfixes = {
 ("1.7.3", "1.7.13"),
 ("/tags/1.8/", "/tags/1.8.0/"),
 ),
-
-
 }
 
 # Speak, if all argument files are newer than this timestamp