diff options
author | Samuel Thibault <sthibault@debian.org> | 2015-04-17 12:49:51 +0000 |
---|---|---|
committer | Samuel Thibault <sthibault@debian.org> | 2015-04-17 12:49:51 +0000 |
commit | 603d6fbf3b97c93f733d2a974ec6adce2cf55137 (patch) | |
tree | 6bf1613f319104fd7dc4045538795e75031f7c68 | |
parent | 0f61941ea823bf8984b52360e165e4a3d530daed (diff) | |
download | installation-guide-603d6fbf3b97c93f733d2a974ec6adce2cf55137.zip |
Revert podiff output which shouldn't have been commited
-rw-r--r-- | po/da/boot-installer.po | 30 | ||||
-rw-r--r-- | po/da/hardware.po | 2 | ||||
-rw-r--r-- | po/da/partitioning.po | 19 | ||||
-rw-r--r-- | po/da/random-bits.po | 3 | ||||
-rw-r--r-- | po/da/using-d-i.po | 25 |
5 files changed, 34 insertions, 45 deletions
diff --git a/po/da/boot-installer.po b/po/da/boot-installer.po index c0cec456c..f8093da10 100644 --- a/po/da/boot-installer.po +++ b/po/da/boot-installer.po @@ -113,7 +113,7 @@ msgstr "" #. Tag: title #: boot-installer.xml:65 #, fuzzy, no-c-format -#| msgid "{-Boot Configuration-}{+Console configuration+}" +#| msgid "Boot Configuration" msgid "Console configuration" msgstr "Opstartskonfiguration" @@ -595,15 +595,13 @@ msgstr "Opstart fra USB-drev" #: boot-installer.xml:449 #, fuzzy, no-c-format #| msgid "" -#| "{-Let's assume-}{+If your computer will boot from USB, this will probably " -#| "be the easiest route for installation. Assuming+} you have prepared " -#| "everything from <xref linkend=\"boot-dev-select\"/> and <xref " -#| "linkend=\"boot-usb-files\"/>{-. Now-}{+,+} just plug your USB stick into " -#| "some free USB connector and reboot the computer. The system should boot " -#| "up, and unless you have used the flexible way to build the stick and not " -#| "enabled it, you should be presented with {-the <prompt>-}{+a graphical +}" -#| "boot{-:</prompt> prompt-}{+ menu+}. Here you can {-enter optional boot " -#| "arguments-}{+select various installer options+}, or just hit &enterkey;." +#| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-" +#| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB " +#| "stick into some free USB connector and reboot the computer. The system " +#| "should boot up, and unless you have used the flexible way to build the " +#| "stick and not enabled it, you should be presented with the <prompt>boot:</" +#| "prompt> prompt. Here you can enter optional boot arguments, or just hit " +#| "&enterkey;." msgid "" "If your computer will boot from USB, this will probably be the easiest route " "for installation. Assuming you have prepared everything from <xref linkend=" @@ -1234,13 +1232,11 @@ msgstr "" #, fuzzy, no-c-format #| msgid "" #| "If you wish or need to add any boot parameters for either the installer " -#| "or the kernel, press &tabkey;{+ (BIOS boot) or &ekey; (UEFI boot)+}. This " -#| "will display the {-default -}boot command for the selected menu entry and " -#| "allow {-to add additional options-}{+you to edit it to suit your needs+}. " -#| "The help screens (see below) list some common possible options. Press " -#| "&enterkey;{+ (BIOS boot) or &f10key; (UEFI boot)+} to boot the installer " -#| "with your options; pressing &escapekey; will return you to the boot menu " -#| "and undo any changes you made." +#| "or the kernel, press &tabkey;. This will display the default boot command " +#| "for the selected menu entry and allow to add additional options. The help " +#| "screens (see below) list some common possible options. Press &enterkey; " +#| "to boot the installer with your options; pressing &escapekey; will return " +#| "you to the boot menu and undo any changes you made." msgid "" "If you wish or need to add any boot parameters for either the installer or " "the kernel, press &tabkey; (BIOS boot) or &ekey; (UEFI boot). This will " diff --git a/po/da/hardware.po b/po/da/hardware.po index 0c98ccb6b..ba545b14e 100644 --- a/po/da/hardware.po +++ b/po/da/hardware.po @@ -911,7 +911,7 @@ msgid "" "In addition to that, the eSATA port on the Cubox-i4Pro is supported." msgstr "" "Cubox-i-serien er et sæt af små, kubisk-formede systemer baseret på " -"Freescale i.MX6 SOC-familien. Systemunderstøttelse for Cubox-i-serien er " +"Freescale i.MX6 SoC-familien. Systemunderstøttelse for Cubox-i-serien er " "begrænset til drivere og information om enhedstræet tilgængelig i " "hovedlinjen af Linuxkernen; Freescale 3.0-kerneserien for Cubox-i er ikke " "understøttet af Debian. Tilgængelige drivere i kernen i hovedlinjen " diff --git a/po/da/partitioning.po b/po/da/partitioning.po index edf226d00..ffe80233f 100644 --- a/po/da/partitioning.po +++ b/po/da/partitioning.po @@ -673,9 +673,7 @@ msgstr "Det andet diskettedrev er navngivet <filename>/dev/fd1</filename>." #. Tag: para #: partitioning.xml:335 #, fuzzy, no-c-format -#| msgid "" -#| "The first {-DASD device-}{+hard disk detected+} is named <filename>/dev/{-" -#| "dasda-}{+sda+}</filename>." +#| msgid "The first DASD device is named <filename>/dev/dasda</filename>." msgid "The first hard disk detected is named <filename>/dev/sda</filename>." msgstr "Den første DASD-enhed er navngivet <filename>/dev/dasda</filename>." @@ -683,8 +681,8 @@ msgstr "Den første DASD-enhed er navngivet <filename>/dev/dasda</filename>." #: partitioning.xml:340 #, fuzzy, no-c-format #| msgid "" -#| "The second {-DASD device-}{+hard disk detected+} is named <filename>/dev/" -#| "{-dasdb-}{+sdb+}</filename>, and so on." +#| "The second DASD device is named <filename>/dev/dasdb</filename>, and so " +#| "on." msgid "" "The second hard disk detected is named <filename>/dev/sdb</filename>, and so " "on." @@ -771,12 +769,11 @@ msgstr "" #| msgid "" #| "Linux represents the primary partitions as the drive name, plus the " #| "numbers 1 through 4. For example, the first primary partition on the " -#| "first {-IDE -}drive is <filename>/dev/{-hda1-}{+sda1+}</filename>. The " -#| "logical partitions are numbered starting at 5, so the first logical " -#| "partition on that same drive is <filename>/dev/{-hda5-}{+sda5+}</" -#| "filename>. Remember that the extended partition, that is, the primary " -#| "partition holding the logical partitions, is not usable by itself.{- This " -#| "applies to SCSI disks as well as IDE disks.-}" +#| "first IDE drive is <filename>/dev/hda1</filename>. The logical partitions " +#| "are numbered starting at 5, so the first logical partition on that same " +#| "drive is <filename>/dev/hda5</filename>. Remember that the extended " +#| "partition, that is, the primary partition holding the logical partitions, " +#| "is not usable by itself. This applies to SCSI disks as well as IDE disks." msgid "" "Linux represents the primary partitions as the drive name, plus the numbers " "1 through 4. For example, the first primary partition on the first drive is " diff --git a/po/da/random-bits.po b/po/da/random-bits.po index d9d95811a..2f8aeae3d 100644 --- a/po/da/random-bits.po +++ b/po/da/random-bits.po @@ -126,8 +126,7 @@ msgstr "" #. Tag: entry #: random-bits.xml:47 #, fuzzy, no-c-format -#| msgid "" -#| "{-Tenth-}{+Seventh+} partition of the {-fourth SCSI-}{+second+} hard disk" +#| msgid "Tenth partition of the fourth SCSI hard disk" msgid "Seventh partition of the second hard disk" msgstr "10. partition for den fjerde SCSI-harddisk" diff --git a/po/da/using-d-i.po b/po/da/using-d-i.po index 41c710e81..d4b3c80b8 100644 --- a/po/da/using-d-i.po +++ b/po/da/using-d-i.po @@ -2316,13 +2316,10 @@ msgstr "" #: using-d-i.xml:1367 #, fuzzy, no-c-format #| msgid "" -#| "If you {-choose-}{+have booted in EFI mode then within the+} guided " -#| "partitioning {-for your IA-64 system,-}{+setup+} there will be an " -#| "additional partition, formatted as a {-FAT16-}{+FAT32+} bootable " -#| "filesystem, for the EFI boot loader{+. This partition is known as an EFI " -#| "System Partition (ESP)+}. There is also an additional menu item in the " -#| "formatting menu to manually set up a partition as an {-EFI boot " -#| "partition-}{+ESP+}." +#| "If you choose guided partitioning for your IA-64 system, there will be an " +#| "additional partition, formatted as a FAT16 bootable filesystem, for the " +#| "EFI boot loader. There is also an additional menu item in the formatting " +#| "menu to manually set up a partition as an EFI boot partition." msgid "" "If you have booted in EFI mode then within the guided partitioning setup " "there will be an additional partition, formatted as a FAT32 bootable " @@ -2535,9 +2532,9 @@ msgstr "" #: using-d-i.xml:1465 #, fuzzy, no-c-format #| msgid "" -#| "If you{+ boot in EFI mode but+} forget to select and format an EFI {-boot " -#| "partition-}{+System Partition+}, <command>partman</command> will detect " -#| "this and will not let you continue until you allocate one." +#| "If you forget to select and format an EFI boot partition, " +#| "<command>partman</command> will detect this and will not let you continue " +#| "until you allocate one." msgid "" "If you boot in EFI mode but forget to select and format an EFI System " "Partition, <command>partman</command> will detect this and will not let you " @@ -5018,10 +5015,10 @@ msgstr "" #: using-d-i.xml:3038 #, fuzzy, no-c-format #| msgid "" -#| "By default, {-grub-}{+Grub+} will be installed into the {-Master Boot " -#| "Record (MBR)-}{+PReP partition+}, where it will{- take-} over complete " -#| "control of the boot process.{- If you prefer, you can install it " -#| "elsewhere. See the grub manual for complete information.-}" +#| "By default, grub will be installed into the Master Boot Record (MBR), " +#| "where it will take over complete control of the boot process. If you " +#| "prefer, you can install it elsewhere. See the grub manual for complete " +#| "information." msgid "" "By default, Grub will be installed into the PReP partition, where it will " "over complete control of the boot process." |