summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cs/appendix/preseed.xml2
-rw-r--r--de/appendix/preseed.xml2
-rw-r--r--debian/changelog4
-rw-r--r--en/appendix/preseed.xml2
-rw-r--r--it/appendix/preseed.xml2
-rw-r--r--po/da/preseed.po2
-rw-r--r--po/el/preseed.po4
-rw-r--r--po/es/preseed.po4
-rw-r--r--po/fi/preseed.po2
-rw-r--r--po/fr/preseed.po4
-rw-r--r--po/hu/preseed.po2
-rw-r--r--po/ja/preseed.po4
-rw-r--r--po/ko/preseed.po4
-rw-r--r--po/nl/preseed.po2
-rw-r--r--po/nn/preseed.po2
-rw-r--r--po/pot/preseed.pot2
-rw-r--r--po/pt/preseed.po4
-rw-r--r--po/ro/preseed.po2
-rw-r--r--po/ru/preseed.po4
-rw-r--r--po/sv/preseed.po2
-rw-r--r--po/tl/preseed.po2
-rw-r--r--po/vi/preseed.po6
-rw-r--r--po/zh_CN/preseed.po6
-rw-r--r--po/zh_TW/preseed.po2
24 files changed, 38 insertions, 34 deletions
diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml
index 92daf0492..9c2b6b28c 100644
--- a/cs/appendix/preseed.xml
+++ b/cs/appendix/preseed.xml
@@ -917,7 +917,7 @@ d-i netcfg/choose_interface select auto
# Rozpoznání aktivního síťového připojení může někdy trvat déle než
# výchozí 3 sekundy. V takovém případě pomůže zvýšení této hodnoty.
-#d-i netcfg/link_detection_timeout string 10
+#d-i netcfg/link_wait_timeout string 10
# Máte-li pomalejší dhcp server a instalačnímu systému vyprší čas při
# čekání na odpověď, bude užitečné následující.
diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml
index f07ec7824..41381c614 100644
--- a/de/appendix/preseed.xml
+++ b/de/appendix/preseed.xml
@@ -933,7 +933,7 @@ d-i netcfg/choose_interface select auto
# Um eine andere Timeout-Zeit für die Verbindungserkennung festzulegen
# (Standard ist 3 Sekunden). Werte werden als Sekunden interpretiert.
-#d-i netcfg/link_detection_timeout string 10
+#d-i netcfg/link_wait_timeout string 10
# Wenn Sie einen langsamen DHCP-Server haben und der Installer läuft in eine
# Zeitüberschreitung, während er auf ihn wartet, könnte dies nützlich sein:
diff --git a/debian/changelog b/debian/changelog
index 265a9ad52..94329a69f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ installation-guide (201409xx) UNRELEASED; urgency=medium
* Warn that one must copy hybrid images on whole USB sticks, not just a
partition. Closes: #762024.
+ [ Samuel Thibault ]
+ * Fix preseed name: netcfg/link_detection_timeout ->
+ netcfg/link_wait_timeout. Thanks Julien Cristau for noticing.
+
-- Samuel Thibault <sthibault@debian.org> Tue, 16 Sep 2014 13:24:16 +0200
installation-guide (20140916) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index dd587857b..61915b40d 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -867,7 +867,7 @@ d-i netcfg/choose_interface select auto
# To set a different link detection timeout (default is 3 seconds).
# Values are interpreted as seconds.
-#d-i netcfg/link_detection_timeout string 10
+#d-i netcfg/link_wait_timeout string 10
# If you have a slow dhcp server and the installer times out waiting for
# it, this might be useful.
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index 58dabcf9a..81a40920d 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -1574,7 +1574,7 @@ d-i netcfg/choose_interface select auto
# Values are interpreted as seconds.
--># Per impostare il tempo di attesa della rilevazione del collegamento
# (il valore predefinito è 3 secondi). Valore espresso in secondi.
-#d-i netcfg/link_detection_timeout string 10
+#d-i netcfg/link_wait_timeout string 10
<!--
# If you have a slow dhcp server and the installer times out waiting for
diff --git a/po/da/preseed.po b/po/da/preseed.po
index ef6ffc6fb..207a17107 100644
--- a/po/da/preseed.po
+++ b/po/da/preseed.po
@@ -1278,7 +1278,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 30d994eec..26579e16d 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1731,7 +1731,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1803,7 +1803,7 @@ msgstr ""
"# Για να καθορίσετε έναν διαφορετικό χρόνο timeout για τη σύνδεση (ο "
"προεπιλεγμένος είναι 3 δευτερόλεπτα).\n"
"# Οι τιμές ερμηνεύοντας ως δευτερόλεπτα.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Αν έχετε έναν αργό εξυπηρετητή dhcp και ο εγκαταστάτης εξαντλεί το χρονικό "
"περιθώριο περιμένοντάς τον\n"
diff --git a/po/es/preseed.po b/po/es/preseed.po
index 9074cde26..f962cee0d 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -1730,7 +1730,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1800,7 +1800,7 @@ msgstr ""
"# Para definir un tiempo de espera de detección de enlace distinto (por\n"
"# omisión, 3 segundos).\n"
"# Los valores se interpretan como segundos.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Si tiene un servidor de DHCP lento y el instalador expira intentando\n"
"# conectarse a él, esto puede serle útil.\n"
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 6f341fbbe..e01d145b0 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -1747,7 +1747,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/fr/preseed.po b/po/fr/preseed.po
index b9e34ec4b..3c670ab64 100644
--- a/po/fr/preseed.po
+++ b/po/fr/preseed.po
@@ -1652,7 +1652,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1721,7 +1721,7 @@ msgstr ""
"\n"
"# Pour augmenter le délai de détection de lien (par défaut, 3 secondes).\n"
"# Valeur en seconde :\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Quand le serveur dhcp est lent et que l'installateur s'arrête pour\n"
"# l'attendre, ceci peut être utile :\n"
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 35bc9e8de..f7bf45852 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -1656,7 +1656,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 68a29edf9..8ee0f588a 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1601,7 +1601,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1669,7 +1669,7 @@ msgstr ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index cdfad3dce..59a89f8d5 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -1571,7 +1571,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1639,7 +1639,7 @@ msgstr ""
"\n"
"# 링크 검사 제한 시간을 다르게 설정할 때(기본값은 3초).\n"
"# 초 단위입니다\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# DHCP 서버가 느려서 응답을 기다리다가 시간이 초과되는 경우\n"
"# 다음 설정을 쓰면 됩니다.\n"
diff --git a/po/nl/preseed.po b/po/nl/preseed.po
index 73cf2201d..09ffd1871 100644
--- a/po/nl/preseed.po
+++ b/po/nl/preseed.po
@@ -1269,7 +1269,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/nn/preseed.po b/po/nn/preseed.po
index 73cf2201d..09ffd1871 100644
--- a/po/nn/preseed.po
+++ b/po/nn/preseed.po
@@ -1269,7 +1269,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index b948382e4..4cad60572 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -947,7 +947,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
- "#d-i netcfg/link_detection_timeout string 10\n"
+ "#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index cd19ec1f6..239f1d682 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1663,7 +1663,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1733,7 +1733,7 @@ msgstr ""
"# Para definir um tempo de timeout diferente para a deteção da ligação\n"
"# (a predefinição são 3 segundos). Os valores são interpretados como\n"
"# segundos.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Se tiver um servidor de dhcp lento e o instalador esgotar o tempo à\n"
"# espera, isto poderá ser útil.\n"
diff --git a/po/ro/preseed.po b/po/ro/preseed.po
index 73cf2201d..09ffd1871 100644
--- a/po/ro/preseed.po
+++ b/po/ro/preseed.po
@@ -1269,7 +1269,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 662be00ca..eb1fb1713 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1668,7 +1668,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1737,7 +1737,7 @@ msgstr ""
"\n"
"# Задаёт время ожидания появления связи (link) (по умолчанию 3 секунды).\n"
"# Значения указываются в секундах.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Если у вас медленный сервер dhcp и программа установки не дожидается\n"
"# ответа, то данная настройка может оказаться полезной.\n"
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 999018f4d..249b47501 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -1761,7 +1761,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/tl/preseed.po b/po/tl/preseed.po
index 73cf2201d..09ffd1871 100644
--- a/po/tl/preseed.po
+++ b/po/tl/preseed.po
@@ -1269,7 +1269,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 47acbf84c..4fd9ac2a5 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -1678,7 +1678,7 @@ msgstr "Theo đây có những biến debconf thích hợp với cấu hình m
#| "\n"
#| "# To set a different link detection timeout (default is 3 seconds).\n"
#| "# Values are interpreted as seconds.\n"
-#| "#di netcfg/link_detection_timeout string 10\n"
+#| "#di netcfg/link_wait_timeout string 10\n"
#| "\n"
#| "# If you have a slow dhcp server and the installer times out waiting for\n"
#| "# it, this might be useful.\n"
@@ -1735,7 +1735,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1803,7 +1803,7 @@ msgstr ""
"\n"
"# Để đặt thời gian dò tìm liên kết khác (mặc định là 3 giây).\n"
"# Giá trị được hiểu là giây.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# Nếu bạn có máy phục vụ DHCP chạy chậm và trình cài đặt quá hạn\n"
"# trong khi đợi nó, đoạn này có thể hữu ích:\n"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 148e36caf..8d642e76c 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1535,7 +1535,7 @@ msgstr "下面的 debconf 变量与网络配置相关。"
#| "\n"
#| "# To set a different link detection timeout (default is 3 seconds).\n"
#| "# Values are interpreted as seconds.\n"
-#| "#d-i netcfg/link_detection_timeout string 10\n"
+#| "#d-i netcfg/link_wait_timeout string 10\n"
#| "\n"
#| "# If you have a slow dhcp server and the installer times out waiting for\n"
#| "# it, this might be useful.\n"
@@ -1597,7 +1597,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1665,7 +1665,7 @@ msgstr ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
diff --git a/po/zh_TW/preseed.po b/po/zh_TW/preseed.po
index 73cf2201d..09ffd1871 100644
--- a/po/zh_TW/preseed.po
+++ b/po/zh_TW/preseed.po
@@ -1269,7 +1269,7 @@ msgid ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#d-i netcfg/link_wait_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:34:37 +0000