aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/en
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@mageia.org>2013-07-07 09:00:53 +0000
committerYuri Chornoivan <yurchor@mageia.org>2013-07-07 09:00:53 +0000
commit2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f (patch)
tree12f56f077e64db48ba62d653d7cef4b75c88c0bb /docs/installer/en
parentcb86d82bc23852fad47e1092917312bfd4ef8b54 (diff)
downloadtools-2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f.tar
tools-2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f.tar.gz
tools-2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f.tar.bz2
tools-2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f.tar.xz
tools-2a6ab6a500cfcc25ff165f8fcd0ae82b40f2e81f.zip
Update PO for configure X_card_list change
Diffstat (limited to 'docs/installer/en')
-rw-r--r--docs/installer/en/configureX_card_list.xml74
-rw-r--r--docs/installer/en/system-config-printer.xml14
2 files changed, 44 insertions, 44 deletions
diff --git a/docs/installer/en/configureX_card_list.xml b/docs/installer/en/configureX_card_list.xml
index fa9f4d64..0c9bae07 100644
--- a/docs/installer/en/configureX_card_list.xml
+++ b/docs/installer/en/configureX_card_list.xml
@@ -1,17 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
-<section xmlns="http://docbook.org/ns/docbook"
-xmlns:ns5="http://www.w3.org/1999/xhtml"
-xmlns:ns4="http://www.w3.org/1998/Math/MathML"
-xmlns:ns3="http://www.w3.org/2000/svg"
-xmlns:ns2="http://www.w3.org/1999/xlink"
-xmlns:ns="http://docbook.org/ns/docbook"
-version="5.0" xml:id="configureX_card_list">
-
- <!-- Initiated by Marja 2012-08-08 -->
- <!-- Further text JohnR 2012-08-29 -->
- <!-- tproof -->
- <!-- lproof -->
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="configureX_card_list">
+ <!-- Initiated by Marja 2012-08-08 -->
+
+ <!-- Further text JohnR 2012-08-29 -->
+
+ <!-- tproof -->
+
+ <!-- lproof -->
+
<info>
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
your Graphic Card)</title>
@@ -19,15 +14,15 @@ version="5.0" xml:id="configureX_card_list">
<mediaobject>
<imageobject>
- <imagedata revision="1" align="center" xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png" format="PNG" />
+ <imagedata revision="1" align="center" xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png" format="PNG"/>
</imageobject>
</mediaobject>
- <para>DrakX has a very comprehensive database of video cards and will usually correctly identify your video device.</para>
-
- <para>If the installer has not correctly detected your graphic card and you know which one you have, you can select it from the tree by:
-
- <itemizedlist>
+ <para>DrakX has a very comprehensive database of video cards and will
+ usually correctly identify your video device.</para>
+
+ <para>If the installer has not correctly detected your graphic card and you
+ know which one you have, you can select it from the tree by: <itemizedlist>
<listitem>
<para>vendor</para>
</listitem>
@@ -41,22 +36,23 @@ version="5.0" xml:id="configureX_card_list">
</listitem>
</itemizedlist></para>
- <para>If you cannot find your card in the vendor lists (because it's not yet in the database
- or it's an older card) you may find a suitable driver in the Xorg category</para>
-
- <para>The Xorg listing provides more than 40 generic and open source video card drivers.
- If you still can't find a named driver for your card there is the option of using
- the vesa driver which provides basic capabilities.</para>
-
- <para>Be aware that if you select an incompatible driver you may only have access
- to the Commandline Interface.</para>
-
-
- <para>Some video card manufacturers provide proprietary drivers for Linux which may only
- be available in the Non-free or Tainted repositories and in some cases only from the
- card manufacturers' websites </para>
-
- <para>The Non-free and Tainted repositories need to be explicitly enabled to access them,
- you should do this after your first reboot.</para>
-
-</section>
+ <para>If you cannot find your card in the vendor lists (because it's not yet
+ in the database or it's an older card) you may find a suitable driver in the
+ Xorg category</para>
+
+ <para>The Xorg listing provides more than 40 generic and open source video
+ card drivers. If you still can't find a named driver for your card there is
+ the option of using the vesa driver which provides basic
+ capabilities.</para>
+
+ <para>Be aware that if you select an incompatible driver you may only have
+ access to the Commandline Interface.</para>
+
+ <para>Some video card manufacturers provide proprietary drivers for Linux
+ which may only be available in the Nonfree repository and in some cases only
+ from the card manufacturers' websites.</para>
+
+ <para>The Nonfree repository need to be explicitly enabled to access them.
+ If you didn't select it previously, you should do this after your first
+ reboot.</para>
+</section> \ No newline at end of file
diff --git a/docs/installer/en/system-config-printer.xml b/docs/installer/en/system-config-printer.xml
index 98dd9040..21c5c5a7 100644
--- a/docs/installer/en/system-config-printer.xml
+++ b/docs/installer/en/system-config-printer.xml
@@ -13,7 +13,7 @@
<mediaobject>
<imageobject>
- <imagedata revision="1" align="center" xml:id="system-config-printer-im1" format="PNG" fileref="system-config-printer.png" width="616" depth="600"/>
+ <imagedata revision="1" align="center" xml:id="system-config-printer-im1" format="PNG" fileref="system-config-printer.png"/>
</imageobject>
</mediaobject>
@@ -73,7 +73,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="printer3.png" width="600"/>
+ <imagedata fileref="printer3.png"/>
</imageobject>
</mediaobject>
@@ -325,9 +325,13 @@
<para>Drivers for Epson printers are available from <link ns2:href="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX">this
search page</link>. For the scanner part, you must install the
- "iscan-data" package first, then "iscan" (in this order). It is possible
- that the iscan package will generate a warning about a conflict with sane.
- Users have reported that this warning can be ignored.</para>
+ "iscan-data" package first, then "iscan" (in this order). A iscan-plugin
+ package can also be available and is to install. Choose the
+ <emphasis>rpm</emphasis> packages according to your architecture. </para>
+
+ <para> It is possible that the iscan package will generate a warning about
+ a conflict with sane. Users have reported that this warning can be
+ ignored.</para>
<para><emphasis role="bold">Canon printers</emphasis></para>