diff options
-rw-r--r-- | cs/appendix/chroot-install.xml | 2 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | en/appendix/chroot-install.xml | 2 | ||||
-rw-r--r-- | it/appendix/chroot-install.xml | 2 | ||||
-rw-r--r-- | po/da/random-bits.po | 2 | ||||
-rw-r--r-- | po/el/random-bits.po | 2 | ||||
-rw-r--r-- | po/es/random-bits.po | 4 | ||||
-rw-r--r-- | po/fi/random-bits.po | 2 | ||||
-rw-r--r-- | po/hu/random-bits.po | 2 | ||||
-rw-r--r-- | po/ja/random-bits.po | 4 | ||||
-rw-r--r-- | po/ko/random-bits.po | 4 | ||||
-rw-r--r-- | po/nl/random-bits.po | 2 | ||||
-rw-r--r-- | po/nn/random-bits.po | 2 | ||||
-rw-r--r-- | po/pt/random-bits.po | 2 | ||||
-rw-r--r-- | po/ro/random-bits.po | 2 | ||||
-rw-r--r-- | po/ru/random-bits.po | 4 | ||||
-rw-r--r-- | po/sv/random-bits.po | 6 | ||||
-rw-r--r-- | po/tl/random-bits.po | 2 | ||||
-rw-r--r-- | po/vi/random-bits.po | 2 | ||||
-rw-r--r-- | po/zh_CN/random-bits.po | 2 | ||||
-rw-r--r-- | po/zh_TW/random-bits.po | 2 |
21 files changed, 27 insertions, 26 deletions
diff --git a/cs/appendix/chroot-install.xml b/cs/appendix/chroot-install.xml index 7e3f0c460..6db00e2e7 100644 --- a/cs/appendix/chroot-install.xml +++ b/cs/appendix/chroot-install.xml @@ -527,7 +527,7 @@ Návod k nastavení zavaděče prozradí příkaz <userinput>info grub</userinput><phrase arch="x86">nebo <userinput>man lilo.conf</userinput></phrase>. Pokud si ponecháte původní operační systém, stačí do stávajícího grub2 -<filename>grub.cfg</filename><phrase arch="x86">nebo +<filename>grub.cfg</filename><phrase arch="x86"> nebo <filename>lilo.conf</filename> přidat příslušnou položku. <filename>lilo.conf</filename> si také můžete zkopírovat do nového systému, zde ho upravit a spustit diff --git a/debian/changelog b/debian/changelog index 2fbbf3d1d..f7ad2a4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ installation-guide (2013XXXX) UNRELEASED; urgency=low * Document that the mirror host name actually has to be a URL base for now. * Suffix web documents with http lang ids rather than locale lang ids, for working content-language negociation. + * Fix space typo reported by Enrico Zini. [ Milan Kupcevic ] * Debian-installer partition table editing tool not compatible with diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index 1e918dce6..8dbf5aef9 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -526,7 +526,7 @@ Check <userinput>info grub</userinput> <phrase arch="x86">or <userinput>man lilo.conf</userinput></phrase> for instructions on setting up the bootloader. If you are keeping the system you used to install &debian;, just add an entry for the &debian; install to your existing grub2 -<filename>grub.cfg</filename><phrase arch="x86">or <filename>lilo.conf</filename>. For +<filename>grub.cfg</filename><phrase arch="x86"> or <filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you could also copy it to the new system and edit it there. After you are done editing, call <command>lilo</command> (remember it will use diff --git a/it/appendix/chroot-install.xml b/it/appendix/chroot-install.xml index 57bfa1796..5ab04298d 100644 --- a/it/appendix/chroot-install.xml +++ b/it/appendix/chroot-install.xml @@ -851,7 +851,7 @@ Check <userinput>info grub</userinput> <phrase arch="x86">or <userinput>man lilo.conf</userinput></phrase> for instructions on setting up the bootloader. If you are keeping the system you used to install &debian;, just add an entry for the &debian; install to your existing grub2 -<filename>grub.cfg</filename><phrase arch="x86">or <filename>lilo.conf</filename>. For +<filename>grub.cfg</filename><phrase arch="x86"> or <filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you could also copy it to the new system and edit it there. After you are done editing, call <command>lilo</command> (remember it will use diff --git a/po/da/random-bits.po b/po/da/random-bits.po index c3e9acef5..b3cd78c40 100644 --- a/po/da/random-bits.po +++ b/po/da/random-bits.po @@ -1344,7 +1344,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/el/random-bits.po b/po/el/random-bits.po index ecd5eedf6..826bdc8ac 100644 --- a/po/el/random-bits.po +++ b/po/el/random-bits.po @@ -1717,7 +1717,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/es/random-bits.po b/po/es/random-bits.po index a035571a8..5ca408577 100644 --- a/po/es/random-bits.po +++ b/po/es/random-bits.po @@ -1731,7 +1731,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " @@ -1742,7 +1742,7 @@ msgstr "" "cómo configurar el gestor de arranque. Si desea mantener el sistema que " "utilizó para instalar &debian;, simplemente añada una entrada para la " "instalación de &debian; para su grub2 existente editando el fichero " -"<filename>grub.cfg</filename><phrase arch=\"x86\">o <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> o <filename>lilo.conf</" "filename> actual. También podría copiar <filename>lilo.conf</filename> al " "nuevo sistema y editarlo allí. Ejecute <command>lilo</command> una vez " "termine de editar el fichero (recuerde que éste usará el <filename>lilo." diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po index d8bbd22e6..5f4533569 100644 --- a/po/fi/random-bits.po +++ b/po/fi/random-bits.po @@ -1715,7 +1715,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po index 3df2c13ca..2df420ee9 100644 --- a/po/hu/random-bits.po +++ b/po/hu/random-bits.po @@ -1772,7 +1772,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po index 9cd6bdb08..0df582546 100644 --- a/po/ja/random-bits.po +++ b/po/ja/random-bits.po @@ -1671,7 +1671,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " @@ -1680,7 +1680,7 @@ msgstr "" "ブートローダのセットアップについての説明は、<userinput>info grub</userinput> " "<phrase arch=\"x86\">や <userinput>man lilo.conf</userinput> </phrase>を" "チェックしてください。&debian; をインストールするのに使用したシステムを保持す" -"る場合、既存の grub2 の <filename>grub.cfg</filename> <phrase arch=\"x86\">" +"る場合、既存の grub2 の <filename>grub.cfg</filename><phrase arch=\"x86\"> " "や <filename>lilo.conf</filename> </phrase>に、&debian; インストールへのエン" "トリを単に加えてください。<phrase arch=\"x86\"><filename>lilo.conf</" "filename> では新システムにそれをコピーし、そこで編集してください。編集を終え" diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po index 216b70403..f5cb71dc4 100644 --- a/po/ko/random-bits.po +++ b/po/ko/random-bits.po @@ -1658,7 +1658,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " @@ -1667,7 +1667,7 @@ msgstr "" "부트 로더 설정 방법은 <userinput>info grub</userinput> <phrase arch=\"x86\"> " "및 <userinput>man lilo.conf</userinput></phrase>를 확인하십시오. &debian;를 " "설치하는 데 사용하는 시스템을 유지하려면 기존의 grub2의 <filename>grub.cfg</" -"filename> <phrase arch=\"x86\"> 아니면 <filename>lilo.conf</filename> </" +"filename><phrase arch=\"x86\"> 아니면 <filename>lilo.conf</filename> </" "phrase>에 &debian; 설치에 항목을 추가하십시오. <phrase arch=\"x86\"> " "<filename>lilo.conf</filename>에서 새로운 시스템으로 복사해 와서 편집하십시" "오. 편집을 마친 후 <command>lilo</command>를 호출하십시오(lilo를 호출 시스템" diff --git a/po/nl/random-bits.po b/po/nl/random-bits.po index c3e9acef5..b3cd78c40 100644 --- a/po/nl/random-bits.po +++ b/po/nl/random-bits.po @@ -1344,7 +1344,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/nn/random-bits.po b/po/nn/random-bits.po index c3e9acef5..b3cd78c40 100644 --- a/po/nn/random-bits.po +++ b/po/nn/random-bits.po @@ -1344,7 +1344,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po index 7ab4cf5d6..1b8d01139 100644 --- a/po/pt/random-bits.po +++ b/po/pt/random-bits.po @@ -1677,7 +1677,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/ro/random-bits.po b/po/ro/random-bits.po index c3e9acef5..b3cd78c40 100644 --- a/po/ro/random-bits.po +++ b/po/ro/random-bits.po @@ -1344,7 +1344,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po index b1ee0b6d7..6168ecee6 100644 --- a/po/ru/random-bits.po +++ b/po/ru/random-bits.po @@ -1689,7 +1689,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " @@ -1700,7 +1700,7 @@ msgstr "" "загрузчика. Если вы оставляете систему, которую использовали для установки " "&debian;, просто добавьте запись для установленной системы &debian; в " "существующий файл grub2 <filename>grub.cfg</filename><phrase arch=" -"\"x86\">или <filename>lilo.conf</filename>. Для <filename>lilo.conf</" +"\"x86\"> или <filename>lilo.conf</filename>. Для <filename>lilo.conf</" "filename> вы можете также скопировать его в новую систему и отредактировать " "его там. После того как закончите редактирование, вызовите <command>lilo</" "command> (помните, что он будет использовать <filename>lilo.conf</filename>, " diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po index feb316708..895170961 100644 --- a/po/sv/random-bits.po +++ b/po/sv/random-bits.po @@ -1696,7 +1696,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " @@ -1706,8 +1706,8 @@ msgstr "" "<userinput>man lilo.conf</userinput></phrase> för instruktioner om hur man " "ställer in starthanteraren. Om du behåller systemet du använde för att " "installera &debian;, lägg bara till en post för &debian;-installationen till " -"din befintliga grub2 <filename>grub.cfg</filename> <phrase arch=" -"\"x86\">eller <filename>lilo.conf</filename>. När det gäller <filename>lilo." +"din befintliga grub2 <filename>grub.cfg</filename><phrase arch=" +"\"x86\"> eller <filename>lilo.conf</filename>. När det gäller <filename>lilo." "conf</filename> kan du även kopiera den till det nya systemet och redigera " "den där. Efter att du är klar med redigeringen, anropa <command>lilo</" "command> (kom ihåg att den använder <filename>lilo.conf</filename> relativt " diff --git a/po/tl/random-bits.po b/po/tl/random-bits.po index c3e9acef5..b3cd78c40 100644 --- a/po/tl/random-bits.po +++ b/po/tl/random-bits.po @@ -1344,7 +1344,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po index e1c0c9662..68e2c8e54 100644 --- a/po/vi/random-bits.po +++ b/po/vi/random-bits.po @@ -1699,7 +1699,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po index 96ae49260..b54502732 100644 --- a/po/zh_CN/random-bits.po +++ b/po/zh_CN/random-bits.po @@ -1616,7 +1616,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po index 79736bad3..5ec8872a8 100644 --- a/po/zh_TW/random-bits.po +++ b/po/zh_TW/random-bits.po @@ -1534,7 +1534,7 @@ msgid "" "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up " "the bootloader. If you are keeping the system you used to install &debian;, " "just add an entry for the &debian; install to your existing grub2 " -"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</" +"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</" "filename>. For <filename>lilo.conf</filename>, you could also copy it to the " "new system and edit it there. After you are done editing, call " "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> " |