diff --git a/apps/i2ptunnel/locale/messages_fr.po b/apps/i2ptunnel/locale/messages_fr.po
index 6f695482c0c9f496314f8084ed93b037933a93f1..39c0be5950ae65dc4a825dc6c1a77b901cdbe4ad 100644
--- a/apps/i2ptunnel/locale/messages_fr.po
+++ b/apps/i2ptunnel/locale/messages_fr.po
@@ -43,18 +43,18 @@ msgstr "Aller sur le site i2p {0} sans enregistrer dans un carnet d'adresses. "
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:892
 #, java-format
 msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Ajouter au carnet d'adresse du routeur {0} et aller sur le site i2p"
+msgstr "Ajouter au carnet d''adresse du routeur {0} et aller sur le site i2p"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:895
 #, java-format
 msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Ajouter au carnet d'adresse principal {0} et aller sur le site i2p"
+msgstr "Ajouter au carnet d''adresse principal {0} et aller sur le site i2p"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:896
 #, java-format
 msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Ajouter au carnet d'adresse privé {0} et aller sur le site i2p"
+msgstr "Ajouter au carnet d''adresse privé {0} et aller sur le site i2p"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1052
 msgid "Click a link below to look for an address helper by using a \"jump\" service:"
@@ -88,12 +88,12 @@ msgstr "Aide"
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1306
 #, java-format
 msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr "{0} ajouté au carnet d'adresses {1}. Redirection en cours."
+msgstr "{0} ajouté au carnet d''adresses {1}. Redirection en cours."
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1307
 #, java-format
 msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr "{0} non ajouté au carnet d'adresses {1}. Redirection en cours."
+msgstr "{0} non ajouté au carnet d''adresses {1}. Redirection en cours."
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1309
 msgid "Click here if you are not redirected automatically."
diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po
index 10e9066254bf3d768578b8f0e6d258ee11ef2140..49f20afa4b6946e0fab2bfeecc3d59384fbec219 100644
--- a/apps/routerconsole/locale/messages_zh.po
+++ b/apps/routerconsole/locale/messages_zh.po
@@ -290,7 +290,7 @@ msgstr "出站连接"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
 msgid "They offered to introduce us (help other peers traverse our firewall)"
-msgstr "对方节点为中继帮助我方穿越防火墙\n"
+msgstr "对方节点为中继帮助我方穿越防火墙"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
 msgid ""
@@ -320,7 +320,7 @@ msgstr "进/出站平滑传输率(Kbyte/s)"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
 msgid "How long ago this connection was established"
-msgstr "连接建立时间\n"
+msgstr "连接建立时间"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:741
@@ -350,7 +350,7 @@ msgstr "等待确认的已发送数据包数量"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
 msgid "The maximum number of concurrent messages to send"
-msgstr "并发消息的最大发送量\n"
+msgstr "并发消息的最大发送量"
 
 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
 msgid "The number of pending sends which exceed congestion window"
@@ -621,7 +621,7 @@ msgstr "按时滞"
 
 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1911
 msgid "Sort by congestion window"
-msgstr "按拥塞窗口\n"
+msgstr "按拥塞窗口"
 
 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1913
 msgid "Sort by slow start threshold"
@@ -2483,11 +2483,11 @@ msgstr "{0} 的客户隧道"
 
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
-msgstr "匿名性警告 - 设置中包括 0-跳点 隧道\n"
+msgstr "匿名性警告 - 设置中包括 0-跳点 隧道"
 
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
-msgstr "匿名性警告 - 设置中包括 1-跳点 隧道\n"
+msgstr "匿名性警告 - 设置中包括 1-跳点 隧道"
 
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
diff --git a/apps/susidns/locale/messages_fr.po b/apps/susidns/locale/messages_fr.po
index b05eb87918d46fafb054bbd21eddc461c8723a57..7ecb3736333e85788c20365c2edc09aad43ee7d9 100644
--- a/apps/susidns/locale/messages_fr.po
+++ b/apps/susidns/locale/messages_fr.po
@@ -21,30 +21,30 @@ msgstr ""
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:130
 #, java-format
 msgid "Host name \"{0}\" contains illegal character {1}"
-msgstr "Le nom d'hôte \"{0}\" contient le caractère illicite  \"{1}\""
+msgstr "Le nom d''hôte \"{0}\" contient le caractère illicite  \"{1}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:143
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:145
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:152
 #, java-format
 msgid "Host name cannot start with \"{0}\""
-msgstr "Le nom d'hôte ne peut pas commencer par \"{0}\""
+msgstr "Le nom d''hôte ne peut pas commencer par \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:147
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:149
 #, java-format
 msgid "Host name cannot end with \"{0}\""
-msgstr "Le nom d'hôte ne peut pas finir par \"{0}\""
+msgstr "Le nom d''hôte ne peut pas finir par \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:154
 #, java-format
 msgid "Host name cannot contain \"{0}\""
-msgstr "Le nom d'hôte ne peut pas contenir \"{0}\""
+msgstr "Le nom d''hôte ne peut pas contenir \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:157
 #, java-format
 msgid "Host name \"{0}\" requires conversion to ASCII but the conversion library is unavailable in this JVM"
-msgstr "Le nom d'hôte \"{0}\" requiert une conversion en ASCII mais la bibliothèque de conversion est indisponible dans cette JVM"
+msgstr "Le nom d''hôte \"{0}\" requiert une conversion en ASCII mais la bibliothèque de conversion est indisponible dans cette JVM"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:209
 msgid "None"
diff --git a/apps/susidns/locale/messages_it.po b/apps/susidns/locale/messages_it.po
index bcbdd88bfebce08a7a3af03f8d9c6ebce90617c0..b0db59adfb0e0a3306c22b0b53b2b221d946b787 100644
--- a/apps/susidns/locale/messages_it.po
+++ b/apps/susidns/locale/messages_it.po
@@ -21,25 +21,25 @@ msgstr ""
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:130
 #, java-format
 msgid "Host name \"{0}\" contains illegal character {1}"
-msgstr "L'host name \"{0}\" contiene il carattere illegale {1}"
+msgstr "L''host name \"{0}\" contiene il carattere illegale {1}"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:143
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:145
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:152
 #, java-format
 msgid "Host name cannot start with \"{0}\""
-msgstr "L'host name non può iniziare con \"{0}\""
+msgstr "L''host name non può iniziare con \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:147
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:149
 #, java-format
 msgid "Host name cannot end with \"{0}\""
-msgstr "L'host name non può finire con \"{0}\""
+msgstr "L''host name non può finire con \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:154
 #, java-format
 msgid "Host name cannot contain \"{0}\""
-msgstr "L'host name non può contenere \"{0}\""
+msgstr "L''host name non può contenere \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:157
 #, java-format
@@ -47,7 +47,7 @@ msgid ""
 "Host name \"{0}\" requires conversion to ASCII but the conversion library is"
 " unavailable in this JVM"
 msgstr ""
-"L'host name \"{0}\" richiede di essere convertito in formato ASCII ma la "
+"L''host name \"{0}\" richiede di essere convertito in formato ASCII ma la "
 "libreria di conversione non è disponibile in questa JVM"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:209
@@ -122,7 +122,7 @@ msgstr "Sostituisci"
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:242
 #, java-format
 msgid "Host name {0} is already in address book, unchanged."
-msgstr "L'host name {0} è già nella rubrica, immutato."
+msgstr "L''host name {0} è già nella rubrica, immutato."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:299
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:244
@@ -131,7 +131,7 @@ msgid ""
 "Host name {0} is already in address book with a different destination. Click"
 " \"Replace\" to overwrite."
 msgstr ""
-"L'host name {0} è già nella rubrica con una destinazione diversa. Fare click"
+"L''host name {0} è già nella rubrica con una destinazione diversa. Fare click"
 " su \"Sostituisci\" per sovrascrivere."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:311