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

xorg: Changes to 'debian-experimental'



 debian/changelog                |   35 ++++++++++++++++++++++++++---------
 debian/po/be.po                 |   28 ++++++----------------------
 debian/po/bg.po                 |   22 ++--------------------
 debian/po/ca.po                 |   21 ++-------------------
 debian/po/fr.po                 |   26 +++++---------------------
 debian/po/he.po                 |   26 ++++----------------------
 debian/po/vi.po                 |   20 +-------------------
 debian/po/zh_CN.po              |   24 ++++--------------------
 debian/po/zh_TW.po              |   23 +----------------------
 debian/xserver-xorg.postinst.in |    3 ++-
 10 files changed, 53 insertions(+), 175 deletions(-)

New commits:
commit 420fda1d89807158087037afe0110fa1904a73b4
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Jul 14 02:34:05 2008 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0a8d8b9..c8945b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~1) UNRELEASED; urgency=low
+xorg (1:7.4~1) experimental; urgency=low
 
   [ Julien Cristau ]
   * X.Org 7.4 release candidate
@@ -22,7 +22,7 @@ xorg (1:7.4~1) UNRELEASED; urgency=low
   * Split the variables in vars.* files to span multiple lines. Makes
     them a lot easier to read and merge.
 
- -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 01 Jul 2008 21:42:13 +0300
+ -- Julien Cristau <jcristau@debian.org>  Mon, 14 Jul 2008 02:34:00 +0200
 
 xorg (1:7.3+14) unstable; urgency=low
 

commit 617c3f9613dc466848ca63e9881f0ef26927026f
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jul 13 10:42:18 2008 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ba33a8f..835a44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.3+14) UNRELEASED; urgency=low
+xorg (1:7.3+14) unstable; urgency=low
 
   * Ignore errors from update-rc.d remove (closes: #490595).
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2008 10:33:49 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2008 10:42:05 +0200
 
 xorg (1:7.3+13) unstable; urgency=low
 

commit 000821941026bd9edc580c9539dd10226299538e
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jul 13 10:41:54 2008 +0200

    Ignore errors from update-rc.d remove (closes: #490595).

diff --git a/debian/changelog b/debian/changelog
index 039a1c4..ba33a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.3+14) UNRELEASED; urgency=low
+
+  * Ignore errors from update-rc.d remove (closes: #490595).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2008 10:33:49 +0200
+
 xorg (1:7.3+13) unstable; urgency=low
 
   [ Debconf translations]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 75bb76c..717b611 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1005,7 +1005,7 @@ case "$1" in
       remove_conffile_commit "/etc/init.d/xserver-xorg"
     fi
     if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
-      update-rc.d xserver-xorg remove
+      update-rc.d xserver-xorg remove || true
     fi
     ;;
 esac

commit dc6ac1a0239edd1561ad1a16a069c90101286169
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jul 12 16:39:15 2008 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4932477..039a1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+13) UNRELEASED; urgency=low
+xorg (1:7.3+13) unstable; urgency=low
 
   [ Debconf translations]
   * Malayalam. Closes: #486830
@@ -14,7 +14,7 @@ xorg (1:7.3+13) UNRELEASED; urgency=low
   * Map the ca-multi d-i keymap to XkbLayout "ca", XkbVariant "multi"
     (closes: #466226).
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 22 Jun 2008 10:17:19 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sat, 12 Jul 2008 16:38:55 +0200
 
 xorg (1:7.3+12) unstable; urgency=low
 

commit a8550c38aa24ceeb16d84893a5c1eec66c431408
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jul 12 15:02:56 2008 +0200

    Map the ca-multi d-i keymap to XkbLayout "ca", XkbVariant "multi" (closes: #466226).

diff --git a/debian/changelog b/debian/changelog
index 8791caa..4932477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ xorg (1:7.3+13) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * Remove obsolete xserver-xorg startup links, closes: #487453.
 
+  [ Julien Cristau ]
+  * Map the ca-multi d-i keymap to XkbLayout "ca", XkbVariant "multi"
+    (closes: #466226).
+
  -- Brice Goglin <bgoglin@debian.org>  Sun, 22 Jun 2008 10:17:19 +0200
 
 xorg (1:7.3+12) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index bd934f1..75bb76c 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -693,6 +693,7 @@ elif [ -n "$DOKBDETECT" ]; then
     br) XMAP="us"; VARIANT="intl"; MODEL="pc104";;
     br-abnt2) XMAP="br"; VARIANT="abnt2"; MODEL="abnt2";;
     by) XMAP="by";;
+    ca-multi) XMAP="ca"; VARIANT="multi";;
     cf) XMAP="ca"; VARIANT="fr";;
     croat) XMAP="hr";;
     cz-lat2) XMAP="cz";;

commit b30992fec25d35e6e8fea83350abf6d0611e10f6
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jul 12 11:53:25 2008 +0200

    debconf-updatepo wants to reformat the po files, so there.

diff --git a/debian/po/be.po b/debian/po/be.po
index 27948c3..41d8f3f 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -142,13 +142,12 @@ msgstr "Набор правілаў XKB для выкарыстання."
 msgid ""
 "For the X server to handle the keyboard correctly, an XKB rule set must be "
 "chosen."
-msgstr "Каб X-сервер мог працаваць з клавіятурай, трэба вызначыць набор правілаў XKB."
+msgstr ""
+"Каб X-сервер мог працаваць з клавіятурай, трэба вызначыць набор правілаў XKB."
 
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "Карыстальнікі бальшыні клавіятур могуць увесці \"xorg\"."
 
@@ -189,22 +188,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"
@@ -358,8 +341,10 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:9001
-msgid "Users of U.S. English keyboards should generally leave this entry blank."
-msgstr "Карыстальнікі амерыканскіх клавіятур (ЗША) могуць пакінуць поле пустым."
+msgid ""
+"Users of U.S. English keyboards should generally leave this entry blank."
+msgstr ""
+"Карыстальнікі амерыканскіх клавіятур (ЗША) могуць пакінуць поле пустым."
 
 #. Type: string
 #. Description
@@ -641,4 +626,3 @@ msgid ""
 msgstr ""
 "Усталяванне пакета лічыцца няўдалым і будзе скончана. Пасля ачысткі каталога "
 "зноў запусціце працэдуру абнаўлення."
-
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 35c2b1f..8a4231d 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -174,8 +174,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "Повечето потребители трябва да въведат „xorg“."
 
@@ -217,22 +215,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"
@@ -385,7 +367,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:9001
-msgid "Users of U.S. English keyboards should generally leave this entry blank."
+msgid ""
+"Users of U.S. English keyboards should generally leave this entry blank."
 msgstr ""
 "Потребителите на американски английски клавиатури би трябвало да оставят "
 "полето празно. За българските потребители са интересни настройките за "
@@ -1205,4 +1188,3 @@ msgstr ""
 #~ msgstr ""
 #~ "За повече информация относно тези модули се обърнете към документацията "
 #~ "на X.Org."
-
diff --git a/debian/po/ca.po b/debian/po/ca.po
index ad8b57a..166fbec 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -176,8 +176,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "Els usuaris de la majoria de teclats han d’entrar «xorg»."
 
@@ -219,22 +217,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"
@@ -254,7 +236,8 @@ msgstr ""
 " Amb el joc de regles «xorg»:\n"
 " - pc101: El teclat tradicional d’estil PC/AT d’IBM amb 101 tecles, comú\n"
 "          històricament als Estats Units.  No té cap tecla «logo» ni «menú».\n"
-" - pc104: Similar al teclat «pc101», amb tecles addicionals.  Aquestes tecles\n"
+" - pc104: Similar al teclat «pc101», amb tecles addicionals.  Aquestes "
+"tecles\n"
 "          porten gravat un símbol amb un «logo» i amb un «menu».\n"
 " - pc102: Similar al teclat «pc101», es sol trobar a Europa.  Inclou una\n"
 "          tecla «< >».\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index b520e31..73510d0 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -186,10 +186,10 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
-msgstr "La plupart des claviers devraient �e correctement g�s en choisissant ��xorg��."
+msgstr ""
+"La plupart des claviers devraient �e correctement g�s en choisissant "
+"��xorg��."
 
 #. Type: string
 #. Description
@@ -230,22 +230,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"
@@ -408,7 +392,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:9001
-msgid "Users of U.S. English keyboards should generally leave this entry blank."
+msgid ""
+"Users of U.S. English keyboards should generally leave this entry blank."
 msgstr ""
 "Les utilisateurs de clavier fran�s devraient choisir la variante latin9 "
 "s'ils ont choisi la disposition ��fr��."
@@ -704,4 +689,3 @@ msgstr ""
 "L'installation du paquet va s'interrompre afin de vous permettre d'effectuer "
 "cette op�tion. Veuillez relancer la proc�re de mise �our apr�avoir "
 "nettoy�e r�rtoire."
-
diff --git a/debian/po/he.po b/debian/po/he.po
index dd36d6c..03d251d 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -145,13 +145,12 @@ msgstr "מערכת חוקי ה-XKB שייעשה בה שימוש:"
 msgid ""
 "For the X server to handle the keyboard correctly, an XKB rule set must be "
 "chosen."
-msgstr "על מנת ששרת ה-X יטפל במקלדת בצורה נכונה, יש צורך לבחור במערכת חוקי XKB."
+msgstr ""
+"על מנת ששרת ה-X יטפל במקלדת בצורה נכונה, יש צורך לבחור במערכת חוקי XKB."
 
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "המשתמשים של רוב המקלדות צריכים להכניס \"xorg\"."
 
@@ -191,22 +190,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"
@@ -358,7 +341,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:9001
-msgid "Users of U.S. English keyboards should generally leave this entry blank."
+msgid ""
+"Users of U.S. English keyboards should generally leave this entry blank."
 msgstr "משתמשי מקלדות של אנגלית-ארה\"ב צריכים בדר\"כ להשאיר שדה זה ריק."
 
 #. Type: string
@@ -637,5 +621,3 @@ msgid ""
 msgstr ""
 "תהליך התקנת חבילה זו ייכשל עכשיו ויסתיים כדי שיהיה באפשרותך לעשות זאת. יש "
 "להריץ מחדש את הליך השדרוג אחרי שניקית את הספרייה כנדרש."
-
-
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 8584942..eb00480 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -154,8 +154,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "Người dùng phần lớn bàn phím nên nhập « xorg »."
 
@@ -197,22 +195,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"
@@ -654,4 +636,4 @@ msgid ""
 "directory."
 msgstr ""
 "Tiến trình cài đặt gói này sẽ thất bại và thoát ngay bây giờ để cho bạn làm "
-"việc này. Hãy chạy lại thủ tục nâng cấp sau khi làm sạch thư mục đó."
\ No newline at end of file
+"việc này. Hãy chạy lại thủ tục nâng cấp sau khi làm sạch thư mục đó."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 7d81dee..eec60ed 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -168,8 +168,6 @@ msgstr "要使 X 服务器能正确处理您的键盘,您必须选择一个 XK
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:6001
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
 msgid "Users of most keyboards should enter \"xorg\"."
 msgstr "绝大部分键盘的用户都应该输入“xorg”。"
 
@@ -209,22 +207,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"
@@ -242,8 +224,10 @@ msgid ""
 " - type5: Sun Type5 keyboards."
 msgstr ""
 " “xorg”规则集:\n"
-" - pc101:传统 101 键 IBM PC/AT 式样键盘,常见于美国。不带“徽标”和“菜单”键;\n"
-" - pc104:类似于 pc101 型号,带有附加键,通常刻有一个“徽标”和一个“菜单”符号;\n"
+" - pc101:传统 101 键 IBM PC/AT 式样键盘,常见于美国。不带“徽标”和“菜"
+"单”键;\n"
+" - pc104:类似于 pc101 型号,带有附加键,通常刻有一个“徽标”和一个“菜单”符"
+"号;\n"
 " - pc102:类似于 pc101,常见于欧洲。包含一个“< >”键;\n"
 " - pc105:类似于 pc104,常见于欧洲。包含一个“< >”键;\n"
 " - macintosh:使用 linux 键码 (keycodes) 的新输入布局的麦金塔键盘;\n"

commit 865843765ccba4b7b3e5b1957d1a54f0645b43d0
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jul 12 11:41:50 2008 +0200

    don't force removal of xserver-xorg init links

diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 55d4643..bd934f1 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1004,7 +1004,7 @@ case "$1" in
       remove_conffile_commit "/etc/init.d/xserver-xorg"
     fi
     if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
-      update-rc.d -f xserver-xorg remove
+      update-rc.d xserver-xorg remove
     fi
     ;;
 esac

commit 99ef7364b485c1a828b0f214864703005efd103f
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Jul 6 08:16:44 2008 +0200

    Traditional Chinese translation update

diff --git a/debian/changelog b/debian/changelog
index 23a927d..8791caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg (1:7.3+13) UNRELEASED; urgency=low
   * Italian. Closes: #487877
   * Swedish. Closes: #488550
   * Dzongkha.
+  * Traditional Chinese. Closes: #486490
 
   [ Brice Goglin ]
   * Remove obsolete xserver-xorg startup links, closes: #487453.
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 8ef2258..4c858a2 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -160,11 +160,8 @@ msgstr "為了讓 X Server 能正確控制鍵盤,您必須選擇一個 XKB 規
 #. 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 "美語鍵盤的使用者通常應該在此欄留白。"
+msgstr "大部份鍵盤的使用者應當在此鍵入 \"xorg\"。"
 
 #. Type: string
 #. Description
@@ -202,23 +199,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,7 +224,6 @@ msgstr ""
 " - pc105:類似於 pc104,常見於歐洲。但包含了一個“< >”鍵;\n"
 " - macintosh:使用新的輸入排列方式並搭配了 Linux 鍵碼的麥金塔鍵盤;\n"
 " - macintosh_old:未使用新的輸入排列方式的麥金塔鍵盤;\n"
-" 搭配 “sun”規則集:\n"
 " - type4:Sun Type4 鍵盤;\n"
 " - type5:Sun Type5 鍵盤。"
 


Reply to: