Merge 10.1 into 10.2

6 files changed, 12 insertions, 12 deletions

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 771658d65aa..107741fc003 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -203,13 +203,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "El MySQL nom�s s'instal�la en cas de tenir un nom d'ordinador central que "
 #~ "no sigui num�ric  i que es pugui resoldre a trav�s del fitxer /etc/hosts. "
 #~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver "
-#~ "una l�nia com la seg�ent \"10.2.0.1 myhostname\"."
+#~ "una l�nia com la seg�ent \"10.0.0.1 myhostname\"."
 
 #, fuzzy
 #~ msgid ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 526f03c99ad..dab52d819f9 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -310,13 +310,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno "
 #~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz "
 #~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný "
-#~ "řádek jako \"10.2.0.1 diamond\"."
+#~ "řádek jako \"10.0.0.1 diamond\"."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/da.po b/debian/po/da.po
index 74117e57dba..80259ba6a34 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -336,12 +336,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL vil kun blive installeret, hvis du har et ikke-numerisk v�rtsnavn, "
 #~ "som kan sl�s op i filen /ets/hosts. Hvis f.eks. kommandoen \"hostname\" "
-#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.2.0.1 "
+#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.0.0.1 "
 #~ "mitvaertsnavn\" i /etc/hosts."
 
 #~ msgid ""
diff --git a/debian/po/es.po b/debian/po/es.po
index cbf727c1530..ed2cf509dbb 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -354,13 +354,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una "
 #~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por "
 #~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá "
-#~ "existir una línea «10.2.0.1 MiNombreEquipo» en dicho archivo."
+#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 03d564da79b..a2a39440389 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -322,13 +322,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "O MySQL será instalado somente caso você possua um nome de host NÃO "
 #~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, "
 #~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como "
-#~ "\"10.2.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
+#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 079a7198d8b..c501fde3db8 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -202,12 +202,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir "
 #~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu "
-#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.2.0.1 makinem\" "
+#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" "
 #~ "gibi bir satır olmalıdır."
 
 #, fuzzy