diff --git a/src/main/java/org/joda/time/format/messages_bg.properties b/src/main/java/org/joda/time/format/messages_bg.properties
index 9fb9bf575..bde391f24 100644
--- a/src/main/java/org/joda/time/format/messages_bg.properties
+++ b/src/main/java/org/joda/time/format/messages_bg.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,\u0438 
-PeriodFormat.commaspaceand=, \u0438 
+PeriodFormat.commandand=,\u0438
+PeriodFormat.commaspaceand=, \u0438
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ \u0438 
 PeriodFormat.year=\ \u0433\u043e\u0434\u0438\u043d\u0430
diff --git a/src/main/java/org/joda/time/format/messages_ca.properties b/src/main/java/org/joda/time/format/messages_ca.properties
index a173c6e80..cce913860 100644
--- a/src/main/java/org/joda/time/format/messages_ca.properties
+++ b/src/main/java/org/joda/time/format/messages_ca.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,i 
-PeriodFormat.commaspaceand=, i 
+PeriodFormat.commandand=,i
+PeriodFormat.commaspaceand=, i
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ i 
 PeriodFormat.year=\ any
diff --git a/src/main/java/org/joda/time/format/messages_cs.properties b/src/main/java/org/joda/time/format/messages_cs.properties
index 9a548b784..86fce8442 100644
--- a/src/main/java/org/joda/time/format/messages_cs.properties
+++ b/src/main/java/org/joda/time/format/messages_cs.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,a 
-PeriodFormat.commaspaceand=, a 
+PeriodFormat.commandand=,a
+PeriodFormat.commaspaceand=, a
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ a 
 PeriodFormat.regex.separator=%
diff --git a/src/main/java/org/joda/time/format/messages_da.properties b/src/main/java/org/joda/time/format/messages_da.properties
index 837cae45f..31599b98b 100644
--- a/src/main/java/org/joda/time/format/messages_da.properties
+++ b/src/main/java/org/joda/time/format/messages_da.properties
@@ -2,8 +2,8 @@ PeriodFormat.space=\
 PeriodFormat.comma=,
 PeriodFormat.commandand=,og
 PeriodFormat.commaspaceand=, og
-PeriodFormat.commaspace=,\ 
-PeriodFormat.spaceandspace=\ og\ 
+PeriodFormat.commaspace=, 
+PeriodFormat.spaceandspace=\ og 
 PeriodFormat.year=\ \u00e5r
 PeriodFormat.years=\ \u00e5r
 PeriodFormat.month=\ m\u00e5ned
diff --git a/src/main/java/org/joda/time/format/messages_de.properties b/src/main/java/org/joda/time/format/messages_de.properties
index 177c2a3e7..de4e4349b 100644
--- a/src/main/java/org/joda/time/format/messages_de.properties
+++ b/src/main/java/org/joda/time/format/messages_de.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,und 
-PeriodFormat.commaspaceand=, und 
+PeriodFormat.commandand=,und
+PeriodFormat.commaspaceand=, und
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ und 
 PeriodFormat.year=\ Jahr
diff --git a/src/main/java/org/joda/time/format/messages_el.properties b/src/main/java/org/joda/time/format/messages_el.properties
index 23cfb4be1..b22fbd97a 100644
--- a/src/main/java/org/joda/time/format/messages_el.properties
+++ b/src/main/java/org/joda/time/format/messages_el.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,\u03ba\u03b1\u03b9 
-PeriodFormat.commaspaceand=, \u03ba\u03b1\u03b9 
+PeriodFormat.commandand=,\u03ba\u03b1\u03b9
+PeriodFormat.commaspaceand=, \u03ba\u03b1\u03b9
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ \u03ba\u03b1\u03b9 
 PeriodFormat.year=\ \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2
diff --git a/src/main/java/org/joda/time/format/messages_es.properties b/src/main/java/org/joda/time/format/messages_es.properties
index 2b601cffb..9f4fa6b44 100644
--- a/src/main/java/org/joda/time/format/messages_es.properties
+++ b/src/main/java/org/joda/time/format/messages_es.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,y 
-PeriodFormat.commaspaceand=, y 
+PeriodFormat.commandand=,y
+PeriodFormat.commaspaceand=, y
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ y 
 PeriodFormat.year=\ a\u00f1o
diff --git a/src/main/java/org/joda/time/format/messages_fi.properties b/src/main/java/org/joda/time/format/messages_fi.properties
index 723be946d..b1905d222 100644
--- a/src/main/java/org/joda/time/format/messages_fi.properties
+++ b/src/main/java/org/joda/time/format/messages_fi.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,ja 
-PeriodFormat.commaspaceand=, ja 
+PeriodFormat.commandand=,ja
+PeriodFormat.commaspaceand=, ja
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ ja 
 PeriodFormat.year=\ vuosi
diff --git a/src/main/java/org/joda/time/format/messages_fr.properties b/src/main/java/org/joda/time/format/messages_fr.properties
index 7275856d4..a16891ee5 100644
--- a/src/main/java/org/joda/time/format/messages_fr.properties
+++ b/src/main/java/org/joda/time/format/messages_fr.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,et 
-PeriodFormat.commaspaceand=, et 
+PeriodFormat.commandand=,et
+PeriodFormat.commaspaceand=, et
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ et 
 PeriodFormat.year=\ ann\u00e9e
diff --git a/src/main/java/org/joda/time/format/messages_iw.properties b/src/main/java/org/joda/time/format/messages_iw.properties
index f15ca3a0e..785183fb0 100644
--- a/src/main/java/org/joda/time/format/messages_iw.properties
+++ b/src/main/java/org/joda/time/format/messages_iw.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=\u05d5, 
-PeriodFormat.commaspaceand=, \u05d5 
+PeriodFormat.commandand=\u05d5,
+PeriodFormat.commaspaceand=, \u05d5
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\-\u05d5 
 PeriodFormat.year=\ \u05e9\u05e0\u05d4
diff --git a/src/main/java/org/joda/time/format/messages_nl.properties b/src/main/java/org/joda/time/format/messages_nl.properties
index b43f56f6f..0b3033c51 100644
--- a/src/main/java/org/joda/time/format/messages_nl.properties
+++ b/src/main/java/org/joda/time/format/messages_nl.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,en 
-PeriodFormat.commaspaceand=, en 
+PeriodFormat.commandand=,en
+PeriodFormat.commaspaceand=, en
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ en 
 PeriodFormat.year=\ jaar
diff --git a/src/main/java/org/joda/time/format/messages_nn.properties b/src/main/java/org/joda/time/format/messages_nn.properties
index adc334a77..013b4f641 100644
--- a/src/main/java/org/joda/time/format/messages_nn.properties
+++ b/src/main/java/org/joda/time/format/messages_nn.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,og 
-PeriodFormat.commaspaceand=, og 
+PeriodFormat.commandand=,og
+PeriodFormat.commaspaceand=, og
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ og 
 PeriodFormat.year=\ \u00e5r
diff --git a/src/main/java/org/joda/time/format/messages_no.properties b/src/main/java/org/joda/time/format/messages_no.properties
index dacda841a..6859b4126 100644
--- a/src/main/java/org/joda/time/format/messages_no.properties
+++ b/src/main/java/org/joda/time/format/messages_no.properties
@@ -2,8 +2,8 @@ PeriodFormat.space=\
 PeriodFormat.comma=,
 PeriodFormat.commandand=,og
 PeriodFormat.commaspaceand=, og
-PeriodFormat.commaspace=,\ 
-PeriodFormat.spaceandspace=\ og\ 
+PeriodFormat.commaspace=, 
+PeriodFormat.spaceandspace=\ og 
 PeriodFormat.year=\ \u00e5r
 PeriodFormat.years=\ \u00e5r
 PeriodFormat.month=\ m\u00e5ned
diff --git a/src/main/java/org/joda/time/format/messages_pl.properties b/src/main/java/org/joda/time/format/messages_pl.properties
index 67c926573..c036fe3d9 100644
--- a/src/main/java/org/joda/time/format/messages_pl.properties
+++ b/src/main/java/org/joda/time/format/messages_pl.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,i 
-PeriodFormat.commaspaceand=, i 
+PeriodFormat.commandand=,i
+PeriodFormat.commaspaceand=, i
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ i 
 PeriodFormat.regex.separator=%
diff --git a/src/main/java/org/joda/time/format/messages_pt.properties b/src/main/java/org/joda/time/format/messages_pt.properties
index e45b73595..d310b1a0a 100644
--- a/src/main/java/org/joda/time/format/messages_pt.properties
+++ b/src/main/java/org/joda/time/format/messages_pt.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,e 
-PeriodFormat.commaspaceand=, e 
+PeriodFormat.commandand=,e
+PeriodFormat.commaspaceand=, e
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ e 
 PeriodFormat.year=\ ano
diff --git a/src/main/java/org/joda/time/format/messages_ro.properties b/src/main/java/org/joda/time/format/messages_ro.properties
index 827222495..0157cacbf 100644
--- a/src/main/java/org/joda/time/format/messages_ro.properties
+++ b/src/main/java/org/joda/time/format/messages_ro.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,\u0219i 
-PeriodFormat.commaspaceand=, \u0219i 
+PeriodFormat.commandand=,\u0219i
+PeriodFormat.commaspaceand=, \u0219i
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ \u0219i 
 PeriodFormat.year=\ an
diff --git a/src/main/java/org/joda/time/format/messages_sk.properties b/src/main/java/org/joda/time/format/messages_sk.properties
index 7e0f48ef6..1438b9aab 100644
--- a/src/main/java/org/joda/time/format/messages_sk.properties
+++ b/src/main/java/org/joda/time/format/messages_sk.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,a 
-PeriodFormat.commaspaceand=, a 
+PeriodFormat.commandand=,a
+PeriodFormat.commaspaceand=, a
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ a 
 PeriodFormat.regex.separator=%
diff --git a/src/main/java/org/joda/time/format/messages_tr.properties b/src/main/java/org/joda/time/format/messages_tr.properties
index 36bd47a54..0fe8d456a 100644
--- a/src/main/java/org/joda/time/format/messages_tr.properties
+++ b/src/main/java/org/joda/time/format/messages_tr.properties
@@ -1,7 +1,7 @@
 PeriodFormat.space=\ 
 PeriodFormat.comma=,
-PeriodFormat.commandand=,ve 
-PeriodFormat.commaspaceand=, ve 
+PeriodFormat.commandand=,ve
+PeriodFormat.commaspaceand=, ve
 PeriodFormat.commaspace=, 
 PeriodFormat.spaceandspace=\ ve 
 PeriodFormat.year=\ y\u0131l