summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2014-11-29 13:31:39 +0000
committerSamuel Thibault <sthibault@debian.org>2014-11-29 13:31:39 +0000
commit1ef66d58858aa10a1b25f6d932842897b98d31b2 (patch)
treec78033a8f5f50bedfad604e23a4406f50fd0426d
parent567b18fed0f30b95f31c2dc5705d25032dd56d3d (diff)
downloadinstallation-guide-1ef66d58858aa10a1b25f6d932842897b98d31b2.zip
Fix trivial build issues
-rw-r--r--build/entities/l10n/eu.ent0
-rw-r--r--build/entities/l10n/tl.ent0
-rw-r--r--po/da/hardware.po4
-rw-r--r--po/da/install-methods.po4
-rw-r--r--po/da/partitioning.po2
-rw-r--r--po/fi/boot-installer.po2
-rw-r--r--po/hu/install-methods.po4
-rw-r--r--po/ro/welcome.po2
-rw-r--r--po/sv/boot-installer.po4
-rw-r--r--po/tl/welcome.po2
-rw-r--r--po/vi/boot-installer.po2
-rw-r--r--po/zh_TW/boot-installer.po2
-rw-r--r--po/zh_TW/hardware.po6
-rw-r--r--po/zh_TW/random-bits.po2
-rw-r--r--po/zh_TW/welcome.po2
-rw-r--r--pt_BR/boot-installer/x86.xml7
16 files changed, 23 insertions, 22 deletions
diff --git a/build/entities/l10n/eu.ent b/build/entities/l10n/eu.ent
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/build/entities/l10n/eu.ent
diff --git a/build/entities/l10n/tl.ent b/build/entities/l10n/tl.ent
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/build/entities/l10n/tl.ent
diff --git a/po/da/hardware.po b/po/da/hardware.po
index 4429e1510..da71b6c85 100644
--- a/po/da/hardware.po
+++ b/po/da/hardware.po
@@ -1983,7 +1983,7 @@ msgstr ""
"undertiden specialiseret eller proprietært udstyr for nogle specifikke "
"funktioner, som måske ikke er understøttet. For at se om din specifikke "
"bærbare fungerer godt med GNU/Linux, kan du for eksempel kigge på "
-"ulink url=\"&url-x86-laptop;\">Linux-bærbare</ulink>."
+"<ulink url=\"&url-x86-laptop;\">Linux-bærbare</ulink>."
#. Tag: title
#: hardware.xml:1358 hardware.xml:1378 hardware.xml:1405 hardware.xml:1428
@@ -2728,7 +2728,7 @@ msgid ""
"GNU/Linux."
msgstr ""
"Der er flere leverandører som leverer systemet med &debian; eller "
-"andre distributioner af GNU/Linux <ulink url=\"&url-pre-installed"
+"andre distributioner af GNU/Linux <ulink url=\"&url-pre-installed;\">"
"forhåndsinstalleret</ulink>. Du betaler måske mere for privilegiet, "
"men det giver lidt ro isindet, da du er sikker på, at udstyret er "
"godt understøttet af GNU/Linux."
diff --git a/po/da/install-methods.po b/po/da/install-methods.po
index 51ae19ee6..9bec79c62 100644
--- a/po/da/install-methods.po
+++ b/po/da/install-methods.po
@@ -1003,7 +1003,7 @@ msgid ""
"CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
"are done."
msgstr ""
-"Derefter monteres USB-hukommelsesdrevet phrase arch=\"x86\">"
+"Derefter monteres USB-hukommelsesdrevet <phrase arch=\"x86\">"
"(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
"phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
"replaceable> /mnt</userinput>),</phrase> som nu vil have <phrase arch="
@@ -1567,7 +1567,7 @@ msgstr ""
"fra filer placeret på harddisken. <application>BootX</application> kan også "
"bruges til dual-boot af MacOS og Linux efter din &debian;-installation er "
"færdig. For Performa 6360 virker det som om, at <command>quik</command> "
-"ikke kan gøre harddisken opstartbar. Så application>BootX</application> "
+"ikke kan gøre harddisken opstartbar. Så <application>BootX</application> "
"er krævet på den model."
#. Tag: para
diff --git a/po/da/partitioning.po b/po/da/partitioning.po
index 74d090bc1..16504ccdb 100644
--- a/po/da/partitioning.po
+++ b/po/da/partitioning.po
@@ -50,7 +50,7 @@ msgstr ""
"Som minimum kræver GNU/&arch-kernel; en partition for sig selv. Du kan have "
"en enkel partition, der indeholder hele operativsystemet, programmer og dine "
"personlige filer. Manage mener også at en separat swap-partition er nødvendig, "
-"selvom det ikke helt er korrekt. quote>Swap</quote> er midlertidig plads "
+"selvom det ikke helt er korrekt. <quote>Swap</quote> er midlertidig plads "
"for et operativsystem, hvor systemet kan bruge disklageret som <quote>virtuel "
"hukommelse</quote>. Ved at placere swap på en separat partition kan "
"&arch-kernel; gøre mere effektiv brug af den. Det er mulgit at tvinge "
diff --git a/po/fi/boot-installer.po b/po/fi/boot-installer.po
index 107e32457..cadaf89e1 100644
--- a/po/fi/boot-installer.po
+++ b/po/fi/boot-installer.po
@@ -372,7 +372,7 @@ msgid ""
msgstr ""
"Asentimen käynnistäminen Windowsista vaatii ensin asennustaltion noutamisen "
"CD- tai DVD-levylle tai muistitikulle kohdassa <xref linkend=\"official-cdrom"
-"\"/> tai <xref linkend=\"boot-usb-files\"/> kuvatulla tavalla."
+"\"/> <phrase condition=\"bootable-usb\">tai <xref linkend=\"boot-usb-files\"/></phrase> kuvatulla tavalla."
#. Tag: para
#: boot-installer.xml:407
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index dbba9ecd5..efdbadd86 100644
--- a/po/hu/install-methods.po
+++ b/po/hu/install-methods.po
@@ -944,8 +944,8 @@ msgstr ""
"\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/sda2</"
"replaceable> /mnt</userinput>), melyen most <phrase arch=\"x86\">egy FAT "
"fájlrendszer</phrase> <phrase arch=\"powerpc\">egy HFS fájlrendszer</phrase> "
-"van, és másolj rá egy &debian; netinst vagy businesscard ISO képet (lásd "
-"ezt: <xref linkend=\"usb-add-iso\"/>). Csatold le (<userinput>umount /mnt</"
+"van, és másolj rá egy &debian; netinst vagy businesscard ISO képet"
+". Csatold le (<userinput>umount /mnt</"
"userinput>) és kész."
#. Tag: title
diff --git a/po/ro/welcome.po b/po/ro/welcome.po
index 929c8d3c5..51e91208d 100644
--- a/po/ro/welcome.po
+++ b/po/ro/welcome.po
@@ -63,7 +63,7 @@ msgstr ""
"Murdock a lansat o invitaţie deschisă către dezvoltatorii de software să "
"contribuie la o distribuţie de software completă şi coerentă bazată pe "
"nucleul relativ infant, numit Linux. Acel grup relativ mic de entuziaşti "
-"dedicaţi, fondat iniţial de <ulink url=\"&url-fsf-intro;\">Fundaţia pentru "
+"dedicaţi, fondat iniţial de <ulink url=\"&url-fsf;\">Fundaţia pentru "
"software liber</ulink>, influenţaţi de filosofia <ulink url=\"&url-gnu-intro;"
"\">GNU</ulink>, de-a lungul anilor, a devenit o organizaţie de aproximativ "
"&num-of-debian-developers; <firstterm>Dezvoltatori Debian</firstterm>."
diff --git a/po/sv/boot-installer.po b/po/sv/boot-installer.po
index 13bc8792c..8fbaf8515 100644
--- a/po/sv/boot-installer.po
+++ b/po/sv/boot-installer.po
@@ -374,8 +374,8 @@ msgid ""
msgstr ""
"För att starta upp installationsprogrammet från Windows måste du första "
"hämta installationsmedia på cd-rom/dvd-rom eller USB-minnespinne som "
-"beskrivet i <xref linkend=\"official-cdrom\"/> och <xref linkend=\"boot-usb-"
-"files\"/>."
+"beskrivet i <xref linkend=\"official-cdrom\"/> <phrase condition=\"bootable-usb\">och <xref linkend=\"boot-usb-"
+"files\"/></phrase>."
#. Tag: para
#: boot-installer.xml:407
diff --git a/po/tl/welcome.po b/po/tl/welcome.po
index b4322453a..ce282b0f0 100644
--- a/po/tl/welcome.po
+++ b/po/tl/welcome.po
@@ -64,7 +64,7 @@ msgstr ""
"si Ian Murdock sa mga debeloper ng software na magbigay tulong sa buo at "
"magkaugnay na pamudmod na software batay sa bagong Linux kernel. Ang maliit "
"na pangkat ng mga dedikadong mga enthusiast, na sa una'y pinondohan ng "
-"<ulink url=\"&url-fsf-intro;\">Free Software Foundation</ulink> at na-"
+"<ulink url=\"&url-fsf;\">Free Software Foundation</ulink> at na-"
"impluwensyahan ng <ulink url=\"&url-gnu-intro;\">pilosopiyang GNU</ulink>, "
"ay lumaki sa loob ng mga taon sa isang organisasyon na may bilang na higit-"
"kumulang sa &num-of-debian-developers; <firstterm>Debeloper ng Debian</"
diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po
index a593f33c7..5f8aff083 100644
--- a/po/vi/boot-installer.po
+++ b/po/vi/boot-installer.po
@@ -374,7 +374,7 @@ msgid ""
"usb-files\"/></phrase> or"
msgstr ""
"lấy đĩa CD/DVD hoặc thanh USB chứa phần mềm cài đặt như được diễn tả trong "
-"<xref linkend=\"official-cdrom\"/> và <xref linkend=\"boot-usb-files\"/>, "
+"<xref linkend=\"official-cdrom\"/> <phrase condition=\"bootable-usb\">và <xref linkend=\"boot-usb-files\"/></phrase>, "
"hoặc"
#. Tag: para
diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po
index eb2a228c0..002653193 100644
--- a/po/zh_TW/boot-installer.po
+++ b/po/zh_TW/boot-installer.po
@@ -356,7 +356,7 @@ msgid ""
"usb-files\"/></phrase> or"
msgstr ""
"為了從硬碟開機安裝程式,您首先必須按照要求下載並且放置所需的文件,請參閱 "
-"<xref linkend=\"boot-drive-files\"/>。"
+"<phrase condition=\"bootable-usb\"><xref linkend=\"boot-drive-files\"/></phrase>。"
#. Tag: para
#: boot-installer.xml:407
diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po
index 1a5c027a1..df6906d4c 100644
--- a/po/zh_TW/hardware.po
+++ b/po/zh_TW/hardware.po
@@ -1974,7 +1974,7 @@ msgid ""
msgstr ""
"&debian; 對顯示卡的支援決定於 XFree86 的 X11 系統。大多數 AGP,PCI 和 PCI 顯"
"示卡都能在 XFree86 下工作。更多的關於圖形匯流排、顯示卡、顯示器和指點設備的支"
-"援情況請參閱 <ulink url=\"&url-xfree86;\"></ulink>。&debian; &release; 包含 "
+"援情況請參閱 <ulink url=\"&url-xorg;\"></ulink>。&debian; &release; 包含 "
"XFree86 &x11ver; 版。"
#. Tag: para
@@ -2421,8 +2421,8 @@ msgid ""
"with that."
msgstr ""
"如果您不得不購買一台搭配 Windows 作業系統販售的機器,請仔細閱讀 Windows 附帶"
-"的軟體授權,您也許可以拒絕該授權並從零售商那裡取得一定的折扣。請參考 <ulink "
-"url=\"&url-windows-refund;\"></ulink> 以瞭解更多的資訊。"
+"的軟體授權,您也許可以拒絕該授權並從零售商那裡取得一定的折扣。請參考 "
+"<quote>windows refund</quote> 以瞭解更多的資訊。"
#. Tag: para
#: hardware.xml:1830
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index d5e6f7681..1081efb23 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -2198,7 +2198,7 @@ msgstr ""
#~ "(例如 /dev/psaux) 直接讀取資料。欲知詳情,請參閱三鍵滑鼠的迷您指南,即 "
#~ "<filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、"
#~ "<userinput>man gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</"
-#~ "filename> 以及 <ulink url=\"&url-xfree86;current/mouse.html\">README."
+#~ "filename> 以及 <ulink url=\"&url-xorg;current/mouse.html\">README."
#~ "mouse</ulink>。"
#~ msgid ""
diff --git a/po/zh_TW/welcome.po b/po/zh_TW/welcome.po
index b852280c7..c21107fb7 100644
--- a/po/zh_TW/welcome.po
+++ b/po/zh_TW/welcome.po
@@ -53,7 +53,7 @@ msgstr ""
"Debian 是一個由自願者組成,致力於自由軟體開發並宣揚自由軟體基金會理念的組"
"織。 Debian 計畫建立於 1993 年。當時,Ian Murdock 發出一份公開信邀請軟體開發"
"者們為這個以當時較新的 Linux 核心、完整而緊密的軟體發行套件貢獻心力。經過多年"
-"的成長,起初由 <ulink url=\"&url-fsf-intro;\">自由軟體基金會 (Free Software "
+"的成長,起初由 <ulink url=\"&url-fsf;\">自由軟體基金會 (Free Software "
"Foundation)</ulink> 資助並受到 <ulink url=\"&url-gnu-intro;\">GNU</ulink> 哲"
"理影響的一小群愛好者已經演變為一個擁有大約 &num-of-debian-developers; 位 "
"<firstterm>Debian 開發人員的組織</firstterm>。"
diff --git a/pt_BR/boot-installer/x86.xml b/pt_BR/boot-installer/x86.xml
index ab278f54c..188185480 100644
--- a/pt_BR/boot-installer/x86.xml
+++ b/pt_BR/boot-installer/x86.xml
@@ -77,9 +77,10 @@ Inicializa com o tipo <quote>bf2.4</quote>.
<para>
Para iniciar o instalador a partir do Windows, você deve primeiro ter uma
-mídia de instalação em <quote>memory stick</quote> USB ou CD-ROM/DVD-ROM
-conforme descrito em <xref linkend="official-cdrom"/> e
-<xref linkend="boot-usb-files"/>.
+mídia de instalação em CD-ROM/DVD-ROM
+<phrase condition="bootable-usb"> ou <quote>memory stick</quote> USB</phrase>
+conforme descrito em <xref linkend="official-cdrom"/>
+<phrase condition="bootable-usb">e <xref linkend="boot-usb-files"/></phrase>.
</para><para>