[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'debian-experimental'



 debian/changelog |   17 ++++++++--
 debian/control   |    2 -
 debian/po/lt.po  |   32 ++----------------
 debian/po/nb.po  |   93 ++++++++++++++++++++-----------------------------------
 debian/po/pl.po  |   37 ++++-----------------
 5 files changed, 62 insertions(+), 119 deletions(-)

New commits:
commit d05fc5cf0876e48798a8307adb71607701c7b864
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Sep 4 02:25:12 2008 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3ab635d..a2d4d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~2) UNRELEASED; urgency=low
+xorg (1:7.4~2) experimental; urgency=low
 
   * Drop the tga driver from xserver-xorg-video-all Depends on !alpha.
   * Bump xserver-xorg's dependency on xserver-xorg-core, to make sure we're
@@ -6,7 +6,7 @@ xorg (1:7.4~2) UNRELEASED; urgency=low
   * Merge changes from the unstable branch up to 1:7.3+16.
   * Update for 1.5 final: require xserver-xorg-video-4.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 16 Aug 2008 03:49:22 +0200
+ -- Julien Cristau <jcristau@debian.org>  Thu, 04 Sep 2008 02:24:54 +0200
 
 xorg (1:7.4~1) experimental; urgency=low
 

commit a411683e9a3ea9ecd3ea811ef314c57862543280
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Sep 4 02:18:39 2008 +0200

    Update for 1.5 final: require xserver-xorg-video-4, bump dependency on -core

diff --git a/debian/changelog b/debian/changelog
index 9348a91..3ab635d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xorg (1:7.4~2) UNRELEASED; urgency=low
 
   * Drop the tga driver from xserver-xorg-video-all Depends on !alpha.
   * Bump xserver-xorg's dependency on xserver-xorg-core, to make sure we're
-    at least on 1.4.99.x.
+    at least on 1.5.
   * Merge changes from the unstable branch up to 1:7.3+16.
+  * Update for 1.5 final: require xserver-xorg-video-4.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Aug 2008 03:49:22 +0200
 
diff --git a/debian/control b/debian/control
index 25775bf..26bcd9b 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Package: xserver-xorg
 Architecture: any
 Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<< 1:7.3+11)
 Replaces: xserver-common, x11-common (<< 1:7.3+11)
-Depends: xserver-xorg-core (>= 2:1.4.99), xserver-xorg-video-all | xserver-xorg-video-2.9, xserver-xorg-input-all | xserver-xorg-input-2.1, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
+Depends: xserver-xorg-core (>= 2:1.5), xserver-xorg-video-all | xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
 Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
 Description: the X.Org X server
  This package depends on the full suite of the server and drivers for the

commit 55bac2d4a53283506680bd28e0448d7d832a6fff
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Sep 3 14:01:43 2008 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4bd263d..3928d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.3+16) UNRELEASED; urgency=low
+xorg (1:7.3+16) unstable; urgency=low
 
   [ Debconf translations ]
   * Lithuanian. Closes: #497314
   * Norwegian Bokmal. Closes: #497315
   * Polish. Closes: #497162
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 31 Aug 2008 22:55:39 +0200
+ -- Julien Cristau <jcristau@debian.org>  Wed, 03 Sep 2008 14:01:38 +0200
 
 xorg (1:7.3+15) unstable; urgency=low
 

commit 475174315eab80a84612ad838e77dceb3e0afbec
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Sep 3 14:00:20 2008 +0200

    pl.po reformatting

diff --git a/debian/po/pl.po b/debian/po/pl.po
index cb5ddc8..df2aea3 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -157,7 +157,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid "Users of U.S. English keyboards should generally enter \"pc104\"."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "Wi�zo���ytkownik�owinna wybra�"xorg\"."
 
@@ -198,22 +197,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:7001
-#| msgid ""
-#| " With the \"xorg\" rule set:\n"
-#| " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
-#| "          the United States.  Has no \"logo\" or \"menu\" keys;\n"
-#| " - pc104: similar to pc101 model, with additional keys, usually engraved\n"
-#| "          with a \"logo\" symbol and a \"menu\" symbol;\n"
-#| " - pc102: similar to pc101 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - pc105: similar to pc104 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - macintosh: Macintosh keyboards using the new input layer with Linux\n"
-#| "              keycodes;\n"
-#| " - macintosh_old: Macintosh keyboards not using the new input layer.\n"
-#| " With the \"sun\" rule set:\n"
-#| " - type4: Sun Type4 keyboards;\n"
-#| " - type5: Sun Type5 keyboards."
 msgid ""
 " With the \"xorg\" rule set:\n"
 " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -235,8 +218,10 @@ msgstr ""
 "          w Stanach Zjednoczonych. Bez klawiszy \"logo\" lub \"menu\";\n"
 " - pc104: podobna do modelu pc101, z dodatkowymi klawiszami, zazwyczaj\n"
 "          oznaczonymi symbolami \"logo\" i \"menu\";\n"
-" - pc102: podobna do pc101 i cz�o u�ywana w Europie. Zawiera klawisz \"< >\";\n" 
-" - pc105: podobna do pc104 i cz�o u�ywana w Europie. Zawiera klawisz \"< >\";\n"
+" - pc102: podobna do pc101 i cz�o u�ywana w Europie. Zawiera klawisz \"< >"
+"\";\n"
+" - pc105: podobna do pc104 i cz�o u�ywana w Europie. Zawiera klawisz \"< >"
+"\";\n"
 " - macintosh: Klawiatury Macontosh u�ywaj�ce nowej metody wej�ciowej\n"
 "              z kodami klawiszy Linux;\n"
 " - macintosh_old: Klawiatury Macintosh nie u�ywaj�ce nowej metody;\n"

commit f5aa6de2f99cd81cd98dd47a4d9354c4de1cc4f0
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 31 22:58:13 2008 +0200

    Updated debconf translations
    
    * Lithuanian. Closes: #497314
    * Norwegian Bokmal. Closes: #497315
    * Polish. Closes: #497162

diff --git a/debian/changelog b/debian/changelog
index 7b4b6dd..4bd263d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.3+16) UNRELEASED; urgency=low
+
+  [ Debconf translations ]
+  * Lithuanian. Closes: #497314
+  * Norwegian Bokmal. Closes: #497315
+  * Polish. Closes: #497162
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 31 Aug 2008 22:55:39 +0200
+
 xorg (1:7.3+15) unstable; urgency=low
 
   [ Debconf translations]
diff --git a/debian/po/lt.po b/debian/po/lt.po
index a9ce1aa..ea68410 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
 "POT-Creation-Date: 2008-06-08 22:20+0200\n"
-"PO-Revision-Date: 2007-04-06 15:54+0300\n"
+"PO-Revision-Date: 2008-08-31 23:09+0300\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
 "MIME-Version: 1.0\n"
@@ -163,13 +163,9 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#, fuzzy
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr ""
-"Angliškos (JAV) klaviatūros naudotojai paprastai šį lauką turėtų palikti "
-"tuščią."
+"Dauguma naudotojų turėtų įvesti „xorg“."
 
 #. Type: string
 #. Description
@@ -209,23 +205,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:7001
-#, fuzzy
-#| msgid ""
-#| " With the \"xorg\" rule set:\n"
-#| " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
-#| "          the United States.  Has no \"logo\" or \"menu\" keys;\n"
-#| " - pc104: similar to pc101 model, with additional keys, usually engraved\n"
-#| "          with a \"logo\" symbol and a \"menu\" symbol;\n"
-#| " - pc102: similar to pc101 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - pc105: similar to pc104 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - macintosh: Macintosh keyboards using the new input layer with Linux\n"
-#| "              keycodes;\n"
-#| " - macintosh_old: Macintosh keyboards not using the new input layer.\n"
-#| " With the \"sun\" rule set:\n"
-#| " - type4: Sun Type4 keyboards;\n"
-#| " - type5: Sun Type5 keyboards."
 msgid ""
 " With the \"xorg\" rule set:\n"
 " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -244,16 +223,15 @@ msgid ""
 msgstr ""
 " Su „xorg“ taisyklių rinkiniu:\n"
 " - pc101: tradicinė IBM PC/AT style klaviatūra su 101 klavišu, įprasta JAV.\n"
-"          Neturi „logo“ arba „meniu“ klavišų;\n"
+"          Neturi „logo“ ir „meniu“ klavišų;\n"
 " - pc104: panaši į pc101, bet su papildomais klavišais, paprastai\n"
-"          su „logo“ bei „menu“ simboliais;\n"
+"          su „logo“ bei „meniu“ simboliais;\n"
 " - pc102: panaši į pc101, dažnai sutinkama Europoje. Turi „< >“ klavišą;\n"
 " - pc105: panaši į pc104, dažnai sutinkama Europoje. Turi „< >“ klavišą;\n"
 " - macintosh: Macintosh klaviatūros (naudojamas naujasis įvedimo sluoksnis\n"
 "              su Linux klavišų kodais);\n"
 " - macintosh_old: Macintosh klaviatūros (naujasis įvedimo sluoksnis "
-"nenaudojamas).\n"
-" Su \"sun\" taisyklių rinkiniu:\n"
+"nenaudojamas);\n"
 " - type4: Sun Type4 klaviatūros;\n"
 " - type5: Sun Type5 klaviatūros."
 
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 980dea0..f961720 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -1,23 +1,17 @@
-# translation of xserver-xorg_debian_nb.po to Norwegian Bokmål
+# translation of xserver-xorg_debian.po to Norwegian Bokmål
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
+# This file is distributed under the same license as the package.
 #
 # Bjørn Steensrud <bjornst@powertech.no>, 2006.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2008.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xserver-xorg_debian_nb\n"
 "Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
 "POT-Creation-Date: 2008-06-08 22:20+0200\n"
-"PO-Revision-Date: 2006-10-03 19:49+0200\n"
-"Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
+"PO-Revision-Date: 2008-08-31 22:50+0200\n"
+"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,11 +154,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#, fuzzy
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
-msgstr "De som bruker U.S. engelsk tastatur bør la dette være tomt."
+msgstr "Brukere av de fleste tastatur bør fylle inn «xorg»."
 
 #. Type: string
 #. Description
@@ -203,23 +194,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:7001
-#, fuzzy
-#| msgid ""
-#| " With the \"xorg\" rule set:\n"
-#| " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
-#| "          the United States.  Has no \"logo\" or \"menu\" keys;\n"
-#| " - pc104: similar to pc101 model, with additional keys, usually engraved\n"
-#| "          with a \"logo\" symbol and a \"menu\" symbol;\n"
-#| " - pc102: similar to pc101 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - pc105: similar to pc104 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - macintosh: Macintosh keyboards using the new input layer with Linux\n"
-#| "              keycodes;\n"
-#| " - macintosh_old: Macintosh keyboards not using the new input layer.\n"
-#| " With the \"sun\" rule set:\n"
-#| " - type4: Sun Type4 keyboards;\n"
-#| " - type5: Sun Type5 keyboards."
 msgid ""
 " With the \"xorg\" rule set:\n"
 " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -236,17 +210,16 @@ msgid ""
 " - type4: Sun Type4 keyboards;\n"
 " - type5: Sun Type5 keyboards."
 msgstr ""
-" Med regelsettet \"xorg\" :\n"
+" Med regelsettet «xorg»:\n"
 " - pc101: tradisjonelt IBM PC/AT tastatur med 101 taster, vanlig\n"
 "          i USA.  Har ingen «logo» eller «meny»-taster;\n"
-" - pc104: likner pc101-modellen, med flere taster, som regel merket\n"
+" - pc104: ligner pc101-modellen, med flere taster, som regel merket\n"
 "          med et «logo» symbol og et «meny» symbol;\n"
-" - pc102: likne pc101 og ofte brukt i Europa. Har en «< >»-tast;\n"
-"  - pc105: likner pc104 og ofte brukt i Europa. Har en «< >»-tast;\n"
+" - pc102: ligner pc101 og ofte brukt i Europa. Har en «< >»-tast;\n"
+" - pc105: ligner pc104 og ofte brukt i Europa. Har en «< >»-tast;\n"
 " - macintosh: Macintosh-tastaturer med nye inndata-lag med Linux\n"
 "              tastekoder;\n"
-" - macintosh_old: Macintosh-tastaturer uten nye inndata-lag.\n"
-" Med regelsettet «sun» :\n"
+" - macintosh_old: Macintosh-tastaturer uten nye inndata-lag;\n"
 " - type4: Sun Type 4-tastaturer;\n"
 " - type5: Sun Type 5-tastaturer."
 
@@ -351,8 +324,8 @@ msgid ""
 "spacing accent marks and diaereses as normal spacing keys, and if this is "
 "the preferred behavior, enter \"nodeadkeys\"."
 msgstr ""
-"Mange tastaturutseender støtter muligheten for å behandle «døde» taster, slik "
-"som aksenter som ikke flytter skrivemerket, som normale taster der "
+"Mange tastaturutseender støtter muligheten for å behandle «døde» taster, "
+"slik som aksenter som ikke flytter skrivemerket, som normale taster der "
 "skrivemerket flyttes, og hvis dette er det som ønskes, oppgi «nodeadkeys». "
 
 #. Type: string
@@ -417,9 +390,9 @@ msgid ""
 "meta_win\"."
 msgstr ""
 "Et annet eksempel: noen vil gjerne ha Meta-taster tilordnet Alt-tastene "
-"(dette er standard) mens andre foretrekker å ha dem på Windows - eller «logo»-"
-"tastene i stedet. Hvis du vil bruke Windows eller logo-tastene som Meta-"
-"taster kan du oppgi «altwin:meta_win»."
+"(dette er standard) mens andre foretrekker å ha dem på Windows - eller "
+"«logo»-tastene i stedet. Hvis du vil bruke Windows eller logo-tastene som "
+"Meta-taster kan du oppgi «altwin:meta_win»."
 
 #. Type: string
 #. Description
@@ -714,9 +687,9 @@ msgstr ""
 #~ "however, the X server configuration files can be edited later to support "
 #~ "a multi-head configuration."
 #~ msgstr ""
-#~ "Innstillingsprosessen støtter for tiden bare oppsett med ett «hode» - kort "
-#~ "og skjerm - men oppsettsfilene for X-tjeneren kan redigeres senere for å "
-#~ "gi støtte til flere «hoder»."
+#~ "Innstillingsprosessen støtter for tiden bare oppsett med ett «hode» - "
+#~ "kort og skjerm - men oppsettsfilene for X-tjeneren kan redigeres senere "
+#~ "for å gi støtte til flere «hoder»."
 
 #~ msgid "Identifier for your video card:"
 #~ msgstr "Hva heter grafikk-kortet:"
@@ -784,8 +757,8 @@ msgstr ""
 #~ "will set some configuration values appropriate for a typical CRT of the "
 #~ "corresponding size, but may be suboptimal for high-quality CRT's."
 #~ msgstr ""
-#~ "Valget «enkel» vil spørre etter skjermens fysiske størrelse, dette stiller "
-#~ "inn noen oppsettsverdier som passer for en typisk skjerm av denne "
+#~ "Valget «enkel» vil spørre etter skjermens fysiske størrelse, dette "
+#~ "stiller inn noen oppsettsverdier som passer for en typisk skjerm av denne "
 #~ "størrelsen, men utnytter kanskje ikke høykvalitetsskjermer."
 
 #~ msgid ""
@@ -922,9 +895,9 @@ msgstr ""
 #~ "8 bits of alpha channel or simple zero padding; the X Window System can "
 #~ "handle both.  If you want either, select 24 bits."
 #~ msgstr ""
-#~ "Såkalt «32-bit farge» er egentlig 24 bit fargeinformasjon pluss 8 bit alfa-"
-#~ "kanal, eller enkel nullutfylling. X Window System kan håndtere begge. "
-#~ "Velg 24 bits om du vil ha en av delene."
+#~ "Såkalt «32-bit farge» er egentlig 24 bit fargeinformasjon pluss 8 bit "
+#~ "alfa-kanal, eller enkel nullutfylling. X Window System kan håndtere "
+#~ "begge. Velg 24 bits om du vil ha en av delene."
 
 #~ msgid "Write default Files section to configuration file?"
 #~ msgstr "Skal standard Files-avsnitt skrives til oppsettsfila?"
@@ -935,9 +908,10 @@ msgstr ""
 #~ "This option is recommended to experienced users only.  In most cases, it "
 #~ "should be enabled."
 #~ msgstr ""
-#~ "«Files»-avsnittet i oppsettsfila for X-tjeneren viser hvor X-tjeneren skal "
-#~ "finne tjenermoduler, RGB-fargedatabasen og skriftfiler. Dette anbefales "
-#~ "bare for erfarne brukere.  I de fleste tilfeller bør dette være slått på."
+#~ "«Files»-avsnittet i oppsettsfila for X-tjeneren viser hvor X-tjeneren "
+#~ "skal finne tjenermoduler, RGB-fargedatabasen og skriftfiler. Dette "
+#~ "anbefales bare for erfarne brukere.  I de fleste tilfeller bør dette være "
+#~ "slått på."
 
 #~ msgid ""
 #~ "Disable this option if you want to maintain a custom Files section into "
@@ -945,10 +919,11 @@ msgstr ""
 #~ "reference to the local font server, add a reference to a different font "
 #~ "server, or rearrange the default set of local font paths."
 #~ msgstr ""
-#~ "Slå av dette om du vil beholde et tilpasset «Files»-avsnitt i oppsettsfila "
-#~ "for X.Org-tjeneren. Dette kan være nødvendig for å ta bort referanser til "
-#~ "den lokale skrift-tjeneren, legge til en referanse til en annen "
-#~ "skrifttjener, eller omordne standardoppsettet for lokale skriftstier."
+#~ "Slå av dette om du vil beholde et tilpasset «Files»-avsnitt i "
+#~ "oppsettsfila for X.Org-tjeneren. Dette kan være nødvendig for å ta bort "
+#~ "referanser til den lokale skrift-tjeneren, legge til en referanse til en "
+#~ "annen skrifttjener, eller omordne standardoppsettet for lokale "
+#~ "skriftstier."
 
 #~ msgid "No X server known for your video hardware"
 #~ msgstr "Ingen kjent X-tjener for ditt video-utstyr."
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 85dffb6..cb5ddc8 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: 6.9.0.dfsg.1-2+SVN\n"
 "Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
 "POT-Creation-Date: 2008-06-08 22:20+0200\n"
-"PO-Revision-Date: 2008-04-26 15:48+0200\n"
+"PO-Revision-Date: 2008-08-31 22:49+0200\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
 "MIME-Version: 1.0\n"
@@ -157,12 +157,9 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#, fuzzy
 #| msgid "Users of U.S. English keyboards should generally enter \"pc104\"."
 msgid "Users of most keyboards should enter \"xorg\"."
-msgstr ""
-"U�ytkownicy angielskich klawiatur U.S. powinni zazwyczaj wprowadzi�"pc104"
-"\"."
+msgstr "Wi�zo���ytkownik�owinna wybra�"xorg\"."
 
 #. Type: string
 #. Description
@@ -201,7 +198,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:7001
-#, fuzzy
 #| msgid ""
 #| " With the \"xorg\" rule set:\n"
 #| " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -239,13 +235,11 @@ msgstr ""
 "          w Stanach Zjednoczonych. Bez klawiszy \"logo\" lub \"menu\";\n"
 " - pc104: podobna do modelu pc101, z dodatkowymi klawiszami, zazwyczaj\n"
 "          oznaczonymi symbolami \"logo\" i \"menu\";\n"
-" - pc102: podobna do pc101 i cz�o u�ywana w Europie. Zawiera klawisz \"< >"
-"\"; - pc105: podobna do pc104 i cz�o u�ywana w Europie. Zawiera klawisz "
-"\"< >\"; - macintosh: Klawiatury Macontosh u�ywaj�ce nowej metody "
-"wej�ciowej\n"
-"z kodami klawiszy Linux;\n"
-" - macintosh_old: Klawiatury Macintosh nie u�ywaj�ce nowej metody.\n"
-" Z regu�� \"sun\":\n"
+" - pc102: podobna do pc101 i cz�o u�ywana w Europie. Zawiera klawisz \"< >\";\n" 
+" - pc105: podobna do pc104 i cz�o u�ywana w Europie. Zawiera klawisz \"< >\";\n"
+" - macintosh: Klawiatury Macontosh u�ywaj�ce nowej metody wej�ciowej\n"
+"              z kodami klawiszy Linux;\n"
+" - macintosh_old: Klawiatury Macintosh nie u�ywaj�ce nowej metody;\n"
 " - type4: klawiatury Sun Type4;\n"
 " - type5: klawiatury Sun Type5."
 


Reply to: