[gnome-packagekit] Update Simplified Chinese translation.



commit 320ddf5ced756a840801e3453933b06a26af85c8
Author: Aron Xu <aronxu gnome org>
Date:   Mon Aug 9 14:04:29 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po |  396 ++++++++++++++++++-----------------------------------------
 1 files changed, 120 insertions(+), 276 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85ee77d..40bac48 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,16 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-packagekit master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"packagekit&component=general\n"
-"POT-Creation-Date: 2010-07-23 10:53+0000\n"
-"PO-Revision-Date: 2010-07-23 20:54+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-09 13:57+0800\n"
+"PO-Revision-Date: 2010-08-09 14:03+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/gpk-application.desktop.in.h:1
 msgid "Add or remove software installed on the system"
@@ -119,7 +118,6 @@ msgid "Software Log"
 msgstr "软件��"
 
 #: ../data/gpk-application.ui.h:24 ../data/gpk-prefs.ui.h:6
-#: ../data/gpk-repo.ui.h:2
 msgid "Software Sources"
 msgstr "软件�"
 
@@ -141,7 +139,7 @@ msgstr "å¼?å??(_D)"
 
 #: ../data/gpk-application.ui.h:29
 msgid "_Filters"
-msgstr "�滤(_F)"
+msgstr "�滤�(_F)"
 
 #: ../data/gpk-application.ui.h:30
 msgid "_Free"
@@ -152,7 +150,7 @@ msgid "_Graphical"
 msgstr "å?¾å½¢ç??é?¢(_G)"
 
 #. TRANSLATORS: context menu to open the offline help file
-#: ../data/gpk-application.ui.h:32 ../src/gpk-check-update.c:268
+#: ../data/gpk-application.ui.h:32 ../src/gpk-check-update.c:271
 msgid "_Help"
 msgstr "帮�(_H)"
 
@@ -245,7 +243,7 @@ msgstr "�滤"
 #: ../data/gpk-prefs.desktop.in.h:1
 msgid ""
 "Change software update preferences and enable or disable software sources"
-msgstr "æ?´æ?¹è½¯ä»¶æ?´æ?°é¦?é??项å??å?¯ç?¨ç¦?ç?¨è½¯ä»¶æº?"
+msgstr "æ?´æ?¹è½¯ä»¶æ?´æ?°é¦?é??项并å?¯ç?¨æ??ç¦?ç?¨è½¯ä»¶æº?"
 
 #: ../data/gpk-prefs.desktop.in.h:2
 msgid "Software Updates"
@@ -254,7 +252,8 @@ msgstr "软件��"
 #: ../data/gpk-prefs.ui.h:1
 msgid ""
 "A software source contains packages that can be installed on this computer."
-msgstr "软件æº?中å??å?«æ­¤è®¡ç®?æ?ºä¸­å?¯ä»¥å®?è£?ç??å??ã??"
+msgstr ""
+"ä¸?个å??å?«å?¯ä»¥å®?è£?å?°æ­¤è®¡ç®?æ?ºç??软件å??ç??软件æº?ã??"
 
 #: ../data/gpk-prefs.ui.h:2
 msgid "C_heck for updates:"
@@ -285,14 +284,10 @@ msgid "_Automatically install:"
 msgstr "����(_A)"
 
 #. shows extra -source, -debuginfo, and -devel software sources
-#: ../data/gpk-prefs.ui.h:11 ../data/gpk-repo.ui.h:4
+#: ../data/gpk-prefs.ui.h:11
 msgid "_Show debug and development software sources"
 msgstr "æ?¾ç¤ºè°?è¯?å??å¼?å??软件æ?¥æº?(_S)"
 
-#: ../data/gpk-repo.ui.h:1
-msgid "Shows more software sources that may be interesting"
-msgstr "�示��"
-
 #. TRANSLATORS: column for what was done, e.g. update-system
 #: ../data/gpk-service-pack.ui.h:1 ../src/gpk-log.c:295
 msgid "Action"
@@ -319,8 +314,7 @@ msgid "Destination package list:"
 msgstr "ç?®æ ?软件å??å??表:"
 
 #. TRANSLATORS: column for what packages were upgraded
-#. TRANSLATORS: column for the message description
-#: ../data/gpk-service-pack.ui.h:7 ../src/gpk-log.c:322 ../src/gpk-watch.c:565
+#: ../data/gpk-service-pack.ui.h:7 ../src/gpk-log.c:322
 msgid "Details"
 msgstr "详�信�"
 
@@ -425,7 +419,6 @@ msgstr "å? é?¤(_R)"
 msgid "Remove %i additional package?"
 msgid_plural "Remove %i additional packages?"
 msgstr[0] "å? é?¤ %i 个é??å? è½¯ä»¶å???"
-msgstr[1] "å? é?¤ %i 个é??å? è½¯ä»¶å???"
 
 #: ../python/packagekit/gtkwidgets.py:615
 msgid ""
@@ -444,7 +437,6 @@ msgstr "��(_I)"
 msgid "Install %i additional package?"
 msgid_plural "Install %i additional packages?"
 msgstr[0] "å®?è£? %i 个é??å? è½¯ä»¶å???"
-msgstr[1] "å®?è£? %i 个é??å? è½¯ä»¶å???"
 
 #: ../python/packagekit/gtkwidgets.py:652
 msgid ""
@@ -488,32 +480,32 @@ msgid "Nothing"
 msgstr "���"
 
 #. TRANSLATORS: for one reason or another, we could not enable or disable a software source
-#: ../src/cc-update-panel.c:519
+#: ../src/cc-update-panel.c:518
 msgid "Failed to change status"
 msgstr "æ? æ³?æ?¹å??ç?¶æ??"
 
 #. TRANSLATORS: column if the source is enabled
-#: ../src/cc-update-panel.c:593
+#: ../src/cc-update-panel.c:592
 msgid "Enabled"
 msgstr "��"
 
 #. TRANSLATORS: column for the source description
-#: ../src/cc-update-panel.c:602
+#: ../src/cc-update-panel.c:601
 msgid "Software Source"
 msgstr "软件�"
 
 #. TRANSLATORS: for one reason or another, we could not get the list of sources
-#: ../src/cc-update-panel.c:664
+#: ../src/cc-update-panel.c:663
 msgid "Failed to get the list of sources"
 msgstr "è?·å??软件æº?å??表失败"
 
 #. TRANSLATORS: backend is broken, and won't tell us what it supports
-#: ../src/cc-update-panel.c:771 ../src/gpk-backend-status.c:76
+#: ../src/cc-update-panel.c:770 ../src/gpk-backend-status.c:76
 #: ../src/gpk-update-viewer.c:3134
 msgid "Exiting as backend details could not be retrieved"
 msgstr "å??端ç??详ç»?ä¿¡æ?¯æ? æ³?å??å¾?ã??æ­£å?¨é??å?ºã??"
 
-#: ../src/cc-update-panel.c:805
+#: ../src/cc-update-panel.c:804
 msgid "Getting software source list not supported by backend"
 msgstr "å??端ç¨?åº?ä¸?æ?¯æ??è?·å??软件æº?å??表"
 
@@ -523,7 +515,6 @@ msgstr "å??端ç¨?åº?ä¸?æ?¯æ??è?·å??软件æº?å??表"
 msgid "%i file installed by %s"
 msgid_plural "%i files installed by %s"
 msgstr[0] "%i 个æ??件已ç?± %s å®?è£?"
-msgstr[1] "%i 个æ??件已ç?± %s å®?è£?"
 
 #. TRANSLATORS: no packages returned
 #: ../src/gpk-application.c:956 ../src/gpk-application.c:1079
@@ -541,7 +532,6 @@ msgstr "此软件å??ä¸?é??è¦?å?¶å®?软件å??"
 msgid "%i package requires %s"
 msgid_plural "%i packages require %s"
 msgstr[0] "%i 个软件å??é??è¦? %s"
-msgstr[1] "%i 个软件å??é??è¦? %s"
 
 #. TRANSLATORS: show a array of packages for the package
 #: ../src/gpk-application.c:970
@@ -549,7 +539,6 @@ msgstr[1] "%i 个软件å??é??è¦? %s"
 msgid "Packages listed below require %s to function correctly."
 msgid_plural "Packages listed below require %s to function correctly."
 msgstr[0] "以ä¸?软件å??é??è¦? %s æ??å?¯æ­£å¸¸è¿?è¡?ã??"
-msgstr[1] "以ä¸?软件å??é??è¦? %s æ??å?¯æ­£å¸¸è¿?è¡?ã??"
 
 #. TRANSLATORS: this package does not depend on any others
 #: ../src/gpk-application.c:1081
@@ -562,7 +551,6 @@ msgstr "此软件å??ä¸?ä¾?èµ?äº?å?¶å®?软件å??"
 msgid "%i additional package is required for %s"
 msgid_plural "%i additional packages are required for %s"
 msgstr[0] "é??è¦? %i 个é??å? è½¯ä»¶å??以使 %s 正常è¿?è¡?"
-msgstr[1] "é??è¦? %i 个é??å? è½¯ä»¶å??以使 %s 正常è¿?è¡?"
 
 #. TRANSLATORS: message: show the array of dependant packages for this package
 #: ../src/gpk-application.c:1093
@@ -570,7 +558,6 @@ msgstr[1] "é??è¦? %i 个é??å? è½¯ä»¶å??以使 %s 正常è¿?è¡?"
 msgid "Packages listed below are required for %s to function correctly."
 msgid_plural "Packages listed below are required for %s to function correctly."
 msgstr[0] "é??è¦?以ä¸?软件å??以使 %s 正常è¿?è¡?"
-msgstr[1] "é??è¦?以ä¸?软件å??以使 %s 正常è¿?è¡?"
 
 #. TRANSLATORS: the repo name is invalid or not found, fall back to this
 #: ../src/gpk-application.c:1158
@@ -752,13 +739,11 @@ msgstr "æ??æ??è¿°æ??ç´¢"
 msgid "Search by file name"
 msgstr "æ??æ??件å??æ??ç´¢"
 
-#: ../src/gpk-application.c:2776 ../src/gpk-check-update.c:199
-#: ../src/gpk-watch.c:419
+#: ../src/gpk-application.c:2776 ../src/gpk-check-update.c:202
 msgid "Licensed under the GNU General Public License Version 2"
 msgstr "å?¨ GNU General Public license Version 2 许å?¯ä¸?å??å¸?"
 
-#: ../src/gpk-application.c:2777 ../src/gpk-check-update.c:200
-#: ../src/gpk-watch.c:420
+#: ../src/gpk-application.c:2777 ../src/gpk-check-update.c:203
 msgid ""
 "PackageKit is free software; you can redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
@@ -768,8 +753,7 @@ msgstr ""
 "PackageKit æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥æ??ç?§ç?±è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU General Public "
 "License (第äº?ç??æ??æ?´æ?°ç??ç??æ?¬) ç??è§?å®?ä¸?é??æ?°å??å¸?æ??ä¿®æ?¹æ?¬è½¯ä»¶ã??"
 
-#: ../src/gpk-application.c:2781 ../src/gpk-check-update.c:204
-#: ../src/gpk-watch.c:424
+#: ../src/gpk-application.c:2781 ../src/gpk-check-update.c:207
 msgid ""
 "PackageKit is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -779,8 +763,7 @@ msgstr ""
 "PackageKit å¸?æ??æ?¬è½¯ä»¶è?½å¤?èµ·å?°ä¸?å®?ç?¨å¤?ï¼?ä½?没æ??ä»»ä½?ä¿?è¯?ï¼?å?³ä½¿æ?¯é»?认ç??å?¯é??å?®æ?§å??"
 "é??ç?¨äº?ç?¹å®?ç?¨é??ç??ä¿?è¯?ã??请å??é?? GNU General Public License æ?¥äº?解详ç»?ä¿¡æ?¯ã??"
 
-#: ../src/gpk-application.c:2785 ../src/gpk-check-update.c:208
-#: ../src/gpk-watch.c:428
+#: ../src/gpk-application.c:2785 ../src/gpk-check-update.c:211
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -790,14 +773,12 @@ msgstr ""
 "软件å?ºé??ä¼?ï¼?51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USAã??"
 
 #. TRANSLATORS: put your own name here -- you deserve credit!
-#: ../src/gpk-application.c:2791 ../src/gpk-check-update.c:213
-#: ../src/gpk-watch.c:433
+#: ../src/gpk-application.c:2791 ../src/gpk-check-update.c:216
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler openoffice org>"
 
 #. TRANSLATORS: website label
-#: ../src/gpk-application.c:2811 ../src/gpk-check-update.c:230
-#: ../src/gpk-watch.c:449
+#: ../src/gpk-application.c:2811 ../src/gpk-check-update.c:233
 msgid "PackageKit Website"
 msgstr "PackageKit ç½?ç«?"
 
@@ -864,7 +845,7 @@ msgstr "å??æ¶?æ??ç´¢"
 
 #. TRANSLATORS: show the program version
 #: ../src/gpk-application-main.c:73 ../src/gpk-backend-status.c:242
-#: ../src/gpk-update-icon.c:78 ../src/gpk-update-viewer-main.c:68
+#: ../src/gpk-update-icon.c:79 ../src/gpk-update-viewer-main.c:68
 msgid "Show the program version and exit"
 msgstr "æ?¾ç¤ºç¨?åº?ç??æ?¬å?·å¹¶é??å?º"
 
@@ -878,30 +859,28 @@ msgid "PackageKit Backend Details Viewer"
 msgstr "PackageKit å??端详ç»?ä¿¡æ?¯æ?¥ç??å?¨"
 
 #. TRANSLATORS: context menu to open the preferences
-#: ../src/gpk-check-update.c:256
+#: ../src/gpk-check-update.c:259
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
 #. TRANSLATORS: context menu to show the about screen
-#. TRANSLATORS: this is the right click menu item
-#: ../src/gpk-check-update.c:276 ../src/gpk-watch.c:476
+#: ../src/gpk-check-update.c:279
 msgid "_About"
 msgstr "��(_A)"
 
 #. TRANSLATORS: we did the update, but some updates were skipped and not applied
-#: ../src/gpk-check-update.c:367
+#: ../src/gpk-check-update.c:370
 msgid "One package was skipped:"
 msgid_plural "Some packages were skipped:"
 msgstr[0] "已跳è¿?以ä¸?软件å??:"
-msgstr[1] "已跳è¿?以ä¸?软件å??:"
 
 #. TRANSLATORS: title: system update completed all okay
-#: ../src/gpk-check-update.c:398
+#: ../src/gpk-check-update.c:401
 msgid "The system update has completed"
 msgstr "ç³»ç»?æ?´æ?°å·²å®?æ??"
 
 #. TRANSLATORS: restart computer as system packages need update
-#: ../src/gpk-check-update.c:406
+#: ../src/gpk-check-update.c:409
 msgid "Restart computer now"
 msgstr "ç?°å?¨é??æ?°å?¯å?¨è®¡ç®?æ?º"
 
@@ -909,100 +888,97 @@ msgstr "ç?°å?¨é??æ?°å?¯å?¨è®¡ç®?æ?º"
 #. TRANSLATORS: hides forever
 #. add a checkbutton for deps screen
 #. TRANSLATORS: don't pop-up the same message twice
-#: ../src/gpk-check-update.c:413 ../src/gpk-check-update.c:1302
-#: ../src/gpk-dialog.c:305 ../src/gpk-hardware.c:196 ../src/gpk-watch.c:1603
+#: ../src/gpk-check-update.c:416 ../src/gpk-check-update.c:1308
+#: ../src/gpk-dialog.c:305 ../src/gpk-hardware.c:196 ../src/gpk-watch.c:830
 msgid "Do not show this again"
 msgstr "ä¸?å??æ?¾ç¤º"
 
 #. TRANSLATORS: button: show more details about the error
 #. TRANSLATORS: button: show details about the error
 #. TRANSLATORS: This is a link in a libnotify bubble that shows the detailed error
-#: ../src/gpk-check-update.c:475 ../src/gpk-dbus-task.c:388
-#: ../src/gpk-watch.c:1425
+#: ../src/gpk-check-update.c:478 ../src/gpk-dbus-task.c:388
+#: ../src/gpk-watch.c:607
 msgid "Show details"
 msgstr "æ?¾ç¤ºè¯¦æ??"
 
 #. TRANSLATORS: this is the application name for libcanberra
-#: ../src/gpk-check-update.c:529 ../src/gpk-check-update.c:919
-#: ../src/gpk-check-update.c:941
+#: ../src/gpk-check-update.c:532 ../src/gpk-check-update.c:922
+#: ../src/gpk-check-update.c:944
 msgid "GNOME PackageKit Update Icon"
 msgstr "GNOME PackageKit ����"
 
 #. TRANSLATORS: this is the sound description
-#: ../src/gpk-check-update.c:531 ../src/gpk-update-viewer.c:519
+#: ../src/gpk-check-update.c:534 ../src/gpk-update-viewer.c:519
 msgid "Updated successfully"
 msgstr "æ?´æ?°æ??å??"
 
 #. TRANSLATORS: title in the libnotify popup
-#: ../src/gpk-check-update.c:657
+#: ../src/gpk-check-update.c:660
 msgid "Security update available"
 msgid_plural "Security updates available"
 msgstr[0] "������"
-msgstr[1] "������"
 
 #. TRANSLATORS: message when there are security updates
-#: ../src/gpk-check-update.c:660
+#: ../src/gpk-check-update.c:663
 msgid "An important update is available for your computer:"
 msgid_plural "Important updates are available for your computer:"
-msgstr[0] "ä¸?个é??è¦?æ?´æ?°å?¯ç?¨äº?æ?¨ç??计ç®?æ?º:"
-msgstr[1] "以ä¸?é??è¦?æ?´æ?°å?¯ç?¨äº?æ?¨ç??计ç®?æ?º:"
+msgstr[0] "以ä¸?é??è¦?æ?´æ?°å?¯ç?¨äº?æ?¨ç??计ç®?æ?ºï¼?"
 
 #. TRANSLATORS: button: open the update viewer to install updates
-#: ../src/gpk-check-update.c:680
+#: ../src/gpk-check-update.c:683
 msgid "Install updates"
 msgstr "����"
 
 #. TRANSLATORS: policy says update, but we are on battery and so prompt
-#: ../src/gpk-check-update.c:761
+#: ../src/gpk-check-update.c:764
 msgid ""
 "Automatic updates are not being installed as the computer is running on "
 "battery power"
 msgstr "æ?¨ç??计ç®?æ?ºæ­£ä½¿ç?¨ç?µæ± ä¾?ç?µã??è?ªå?¨æ?´æ?°å°?ä¸?ä¼?å®?è£?ã??"
 
 #. TRANSLATORS: informs user will not install by default
-#: ../src/gpk-check-update.c:763
+#: ../src/gpk-check-update.c:766
 msgid "Updates not installed"
 msgstr "�����"
 
 #. TRANSLATORS: to hell with my battery life, just do it
-#: ../src/gpk-check-update.c:773
+#: ../src/gpk-check-update.c:776
 msgid "Install the updates anyway"
 msgstr "����"
 
 #. TRANSLATORS: title: notification when we scheduled an automatic update
-#: ../src/gpk-check-update.c:799
+#: ../src/gpk-check-update.c:802
 msgid "Updates are being installed"
 msgstr "��正���"
 
 #. TRANSLATORS: tell the user why the hard disk is grinding...
-#: ../src/gpk-check-update.c:801
+#: ../src/gpk-check-update.c:804
 msgid "Updates are being automatically installed on your computer"
 msgstr "��正�������计��"
 
-#: ../src/gpk-check-update.c:807
+#: ../src/gpk-check-update.c:810
 msgid "Cancel update"
 msgstr "å??æ¶?æ?´æ?°"
 
 #. TRANSLATORS: tooltip: how many updates are waiting to be applied
-#: ../src/gpk-check-update.c:891
+#: ../src/gpk-check-update.c:894
 #, c-format
 msgid "There is %d update available"
 msgid_plural "There are %d updates available"
 msgstr[0] "%d 个����"
-msgstr[1] "%d 个����"
 
 #. TRANSLATORS: this is the sound description
-#: ../src/gpk-check-update.c:921
+#: ../src/gpk-check-update.c:924
 msgid "Update available"
 msgstr "����"
 
 #. TRANSLATORS: this is the sound description
-#: ../src/gpk-check-update.c:943
+#: ../src/gpk-check-update.c:946
 msgid "Update available (on battery)"
 msgstr "æ?´æ?°å?¯ç?¨ (å?¨ä½¿ç?¨ç?µæ± ç??æ??å?µä¸?)"
 
 #. TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9
-#: ../src/gpk-check-update.c:1289
+#: ../src/gpk-check-update.c:1295
 msgid "Distribution upgrades available"
 msgstr "å??è¡?ç??å??级å?¯ç?¨"
 
@@ -1011,7 +987,7 @@ msgstr "å??è¡?ç??å??级å?¯ç?¨"
 #. TRANSLATORS: button: show the user a button to get more help finding stuff
 #. TRANSLATORS: button text
 #. TRANSLATORS: button: show the user a button to get more help finding stuff
-#: ../src/gpk-check-update.c:1299 ../src/gpk-dbus-task.c:1100
+#: ../src/gpk-check-update.c:1305 ../src/gpk-dbus-task.c:1100
 #: ../src/gpk-dbus-task.c:1334 ../src/gpk-dbus-task.c:1640
 #: ../src/gpk-dbus-task.c:1846 ../src/gpk-dbus-task.c:2102
 msgid "More information"
@@ -1057,7 +1033,6 @@ msgstr "ç?°å?¨"
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i �"
-msgstr[1] "%i �"
 
 #. TRANSLATORS: time
 #: ../src/gpk-common.c:475 ../src/gpk-common.c:528
@@ -1065,7 +1040,6 @@ msgstr[1] "%i �"
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i å??é??"
-msgstr[1] "%i å??é??"
 
 #. TRANSLATORS: time
 #: ../src/gpk-common.c:481 ../src/gpk-common.c:547
@@ -1073,7 +1047,6 @@ msgstr[1] "%i å??é??"
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i å°?æ?¶"
-msgstr[1] "%i å°?æ?¶"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i minutes %i seconds"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
@@ -1088,19 +1061,16 @@ msgstr "%i %s %i %s"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
-msgstr[1] "å??é??"
 
 #: ../src/gpk-common.c:536
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "�"
-msgstr[1] "�"
 
 #: ../src/gpk-common.c:554
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
-msgstr[1] "å°?æ?¶"
 
 #: ../src/gpk-common.c:581
 #, c-format
@@ -1134,7 +1104,7 @@ msgstr "æ?ªé??å®?è¦?å®?è£?ç??åº?ç?¨ç¨?åº?"
 
 #. TRANSLATORS: detailed text about the error
 #. TRANSLATORS: The detailed error if the user clicks "more info"
-#: ../src/gpk-dbus-task.c:281 ../src/gpk-watch.c:398
+#: ../src/gpk-dbus-task.c:281 ../src/gpk-watch.c:112
 msgid "Error details"
 msgstr "é??误详æ??"
 
@@ -1186,14 +1156,12 @@ msgstr "æ­£å?¨å®?è£?软件å??"
 msgid "Failed to install file"
 msgid_plural "Failed to install files"
 msgstr[0] "æ??件å®?è£?失败"
-msgstr[1] "æ??件å®?è£?失败"
 
 #. TRANSLATORS: title: confirm the user want's to install a local file
 #: ../src/gpk-dbus-task.c:705
 msgid "Do you want to install this file?"
 msgid_plural "Do you want to install these files?"
 msgstr[0] "æ?¯å?¦è¦?å®?è£?æ­¤æ??件?"
-msgstr[1] "æ?¯å?¦è¦?å®?è£?è¿?äº?æ??件?"
 
 #. TRANSLATORS: title: installing local files
 #. TRANSLATORS: button: confirm to search for packages
@@ -1216,7 +1184,6 @@ msgstr "��"
 msgid "Install local file"
 msgid_plural "Install local files"
 msgstr[0] "å®?è£?æ?¬å?°æ??件"
-msgstr[1] "å®?è£?æ?¬å?°æ??件"
 
 #. TRANSLATORS: couldn't resolve name to package
 #: ../src/gpk-dbus-task.c:1088
@@ -1248,14 +1215,12 @@ msgstr "æ??ç´¢æ?¶å¾?å?°ä¸?正确ç??å??åº?"
 msgid "An additional package is required:"
 msgid_plural "Additional packages are required:"
 msgstr[0] "é??è¦?ä¸?个é??å? è½¯ä»¶å??:"
-msgstr[1] "é??è¦?ä¸?äº?é??å? è½¯ä»¶å??:"
 
 #. TRANSLATORS: ask the user if it's okay to search
 #: ../src/gpk-dbus-task.c:1233
 msgid "Do you want to search for and install this package now?"
 msgid_plural "Do you want to search for and install these packages now?"
 msgstr[0] "æ?¯å?¦è¦?æ?¥æ?¾å¹¶å®?è£?此软件å???"
-msgstr[1] "æ?¯å?¦è¦?æ?¥æ?¾å¹¶å®?è£?è¿?äº?软件å???"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:1239
@@ -1263,14 +1228,12 @@ msgstr[1] "æ?¯å?¦è¦?æ?¥æ?¾å¹¶å®?è£?è¿?äº?软件å???"
 msgid "%s wants to install a package"
 msgid_plural "%s wants to install packages"
 msgstr[0] "%s è¦?å®?è£?ä¸?个软件å??"
-msgstr[1] "%s è¦?å®?è£?ä¸?äº?软件å??"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
 #: ../src/gpk-dbus-task.c:1242
 msgid "A program wants to install a package"
 msgid_plural "A program wants to install packages"
 msgstr[0] "æ??个ç¨?åº?è¦?å®?è£?ä¸?个软件å??"
-msgstr[1] "æ??个ç¨?åº?è¦?å®?è£?ä¸?äº?软件å??"
 
 #. TRANSLATORS: title, searching
 #: ../src/gpk-dbus-task.c:1259 ../src/gpk-dbus-task.c:2581
@@ -1298,14 +1261,12 @@ msgstr "%s 软件å??å·²ç»?å?¯æ??ä¾?æ­¤æ??件"
 msgid "The following file is required:"
 msgid_plural "The following files are required:"
 msgstr[0] "é??è¦?以ä¸?æ??件:"
-msgstr[1] "é??è¦?以ä¸?æ??件:"
 
 #. TRANSLATORS: confirm with the user
 #: ../src/gpk-dbus-task.c:1453
 msgid "Do you want to search for this file now?"
 msgid_plural "Do you want to search for these files now?"
 msgstr[0] "æ?¯å?¦è¦?ç?°å?¨æ?¥æ?¾æ­¤æ??件?"
-msgstr[1] "æ?¯å?¦è¦?ç?°å?¨æ?¥æ?¾è¿?äº?æ??件?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:1458
@@ -1313,14 +1274,12 @@ msgstr[1] "æ?¯å?¦è¦?ç?°å?¨æ?¥æ?¾è¿?äº?æ??件?"
 msgid "%s wants to install a file"
 msgid_plural "%s wants to install files"
 msgstr[0] "%s é??è¦?å®?è£?ä¸?个æ??件"
-msgstr[1] "%s é??è¦?å®?è£?ä¸?äº?æ??件"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
 #: ../src/gpk-dbus-task.c:1461
 msgid "A program wants to install a file"
 msgid_plural "A program wants to install files"
 msgstr[0] "æ??个ç¨?åº?é??è¦?å®?è£?ä¸?个æ??件"
-msgstr[1] "æ??个ç¨?åº?é??è¦?å®?è£?ä¸?äº?æ??件"
 
 #. TRANSLATORS: searching for the package that provides the file
 #. TRANSLATORS: The role of the transaction, in present tense
@@ -1334,14 +1293,12 @@ msgstr "æ­£å?¨æ?¥æ?¾æ??件"
 msgid "The following plugin is required:"
 msgid_plural "The following plugins are required:"
 msgstr[0] "é??å®?è£?以ä¸?æ??件:"
-msgstr[1] "é??å®?è£?以ä¸?æ??件:"
 
 #. TRANSLATORS: ask for confirmation
 #: ../src/gpk-dbus-task.c:1538
 msgid "Do you want to search for this now?"
 msgid_plural "Do you want to search for these now?"
 msgstr[0] "æ?¯å?¦è¦?å¼?å§?æ??ç´¢?"
-msgstr[1] "æ?¯å?¦è¦?å¼?å§?æ??ç´¢?"
 
 #. TRANSLATORS: a program wants to decode something (unknown) -- string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:1551
@@ -1349,7 +1306,6 @@ msgstr[1] "æ?¯å?¦è¦?å¼?å§?æ??ç´¢?"
 msgid "%s requires an additional plugin to decode this file"
 msgid_plural "%s requires additional plugins to decode this file"
 msgstr[0] "%s é??è¦?ä¸?个é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
-msgstr[1] "%s é??è¦?ä¸?äº?é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
 
 #. TRANSLATORS: a program wants to encode something (unknown) -- string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:1555
@@ -1357,7 +1313,6 @@ msgstr[1] "%s é??è¦?ä¸?äº?é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
 msgid "%s requires an additional plugin to encode this file"
 msgid_plural "%s requires additional plugins to encode this file"
 msgstr[0] "%s é??è¦?ä¸?个é??å? æ??件æ?¥ç¼?ç ?æ­¤æ??件"
-msgstr[1] "%s é??è¦?ä¸?äº?é??å? æ??件æ?¥ç¼?ç ?æ­¤æ??件"
 
 #. TRANSLATORS: a program wants to do something (unknown) -- string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:1559
@@ -1365,28 +1320,24 @@ msgstr[1] "%s é??è¦?ä¸?äº?é??å? æ??件æ?¥ç¼?ç ?æ­¤æ??件"
 msgid "%s requires an additional plugin for this operation"
 msgid_plural "%s requires additional plugins for this operation"
 msgstr[0] "%s é??è¦?ä¸?个é??å? æ??件æ?¥æ?§è¡?æ­¤æ??ä½?"
-msgstr[1] "%s é??è¦?ä¸?äº?é??å? æ??件æ?¥æ?§è¡?æ­¤æ??ä½?"
 
 #. TRANSLATORS: a random program which we can't get the name wants to decode something
 #: ../src/gpk-dbus-task.c:1565
 msgid "A program requires an additional plugin to decode this file"
 msgid_plural "A program requires additional plugins to decode this file"
 msgstr[0] "æ??个ç¨?åº?é??è¦?ä¸?个é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
-msgstr[1] "æ??个ç¨?åº?é??è¦?ä¸?äº?é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
 
 #. TRANSLATORS: a random program which we can't get the name wants to encode something
 #: ../src/gpk-dbus-task.c:1569
 msgid "A program requires an additional plugin to encode this file"
 msgid_plural "A program requires additional plugins to encode this file"
 msgstr[0] "æ??个ç¨?åº?é??è¦?ä¸?个é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
-msgstr[1] "æ??个ç¨?åº?é??è¦?ä¸?äº?é??å? æ??件æ?¥è§£ç ?æ­¤æ??件"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something (unknown)
 #: ../src/gpk-dbus-task.c:1573
 msgid "A program requires an additional plugin for this operation"
 msgid_plural "A program requires additional plugins for this operation"
 msgstr[0] "æ??个ç¨?åº?é??è¦?ä¸?个é??å? æ??件æ?¥æ?§è¡?æ­¤æ??ä½?"
-msgstr[1] "æ??个ç¨?åº?é??è¦?ä¸?äº?é??å? æ??件æ?¥æ?§è¡?æ­¤æ??ä½?"
 
 #. TRANSLATORS: button: confirm to search for packages
 #: ../src/gpk-dbus-task.c:1579 ../src/gpk-dbus-task.c:1932
@@ -1408,15 +1359,13 @@ msgstr "æ? æ³?å?¨ä»»ä½?å·²é??ç½®ç??软件æº?中æ?¾å?°æ??件"
 msgid "Install the following plugin"
 msgid_plural "Install the following plugins"
 msgstr[0] "å®?è£?以ä¸?æ??件"
-msgstr[1] "å®?è£?以ä¸?æ??件"
 
 #. TRANSLATORS: title: show a list of fonts
 #: ../src/gpk-dbus-task.c:1660 ../src/gpk-dbus-task.c:2122
 #: ../src/gpk-dbus-task.c:2513
 msgid "Do you want to install this package now?"
 msgid_plural "Do you want to install these packages now?"
-msgstr[0] "æ?¯å?¦è¦?ç?°å?¨å®?è£?此软件å???"
-msgstr[1] "æ?¯å?¦è¦?ç?°å?¨å®?è£?è¿?äº?软件å???"
+msgstr[0] "æ?¯å?¦è¦?ç?°å?¨å®?è£?以ä¸?软件å???"
 
 #. TRANSLATORS: search for codec
 #: ../src/gpk-dbus-task.c:1752
@@ -1458,15 +1407,13 @@ msgstr "æ?¯å?¦è¦?æ?¥æ?¾æ??å¼?此类å??æ??件ç??ç¨?åº??"
 #, c-format
 msgid "%s requires a new mime type"
 msgid_plural "%s requires new mime types"
-msgstr[0] "%s é??è¦?ä¸?个æ?°ç?? mime ç±»å??"
-msgstr[1] "%s é??è¦?ä¸?äº?æ?°ç?? mime ç±»å??"
+msgstr[0] "%s é??è¦?æ?°ç?? mime ç±»å??"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
 #: ../src/gpk-dbus-task.c:1928
 msgid "A program requires a new mime type"
 msgid_plural "A program requires new mime types"
-msgstr[0] "æ??个ç¨?åº?é??è¦?ä¸?个æ?°ç?? mime ç±»å??"
-msgstr[1] "æ??个ç¨?åº?é??è¦?ä¸?äº?æ?°ç?? mime ç±»å??"
+msgstr[0] "æ??个ç¨?åº?é??è¦?æ?°ç?? mime ç±»å??"
 
 #. TRANSLATORS: title: searching for mime type handlers
 #: ../src/gpk-dbus-task.c:1943
@@ -1488,7 +1435,6 @@ msgstr "语è¨?代ç ?ä¸?å?¹é??"
 msgid "Failed to find font"
 msgid_plural "Failed to find fonts"
 msgstr[0] "����失败"
-msgstr[1] "����失败"
 
 #. TRANSLATORS: message: tell the user we suck
 #: ../src/gpk-dbus-task.c:2099
@@ -1499,37 +1445,32 @@ msgstr "æ? æ³?æ?¾å?°å?¯ä¾?æ?¥ç??æ­¤æ??件ç??æ?°å­?ä½?"
 #: ../src/gpk-dbus-task.c:2285
 msgid "An additional font is required to view this document correctly."
 msgid_plural "Additional fonts are required to view this document correctly."
-msgstr[0] "è¦?正确æ?¥ç??æ­¤æ??件ï¼?é??è¦?ä¸?个é??å? ç??å­?ä½?"
-msgstr[1] "è¦?正确æ?¥ç??æ­¤æ??件ï¼?é??è¦?ä¸?äº?é??å? ç??å­?ä½?"
+msgstr[0] "è¦?正确æ?¥ç??æ­¤æ??件ï¼?é??è¦?é??å? ç??å­?ä½?"
 
 #. TRANSLATORS: we need to download a new font package to display a document
 #: ../src/gpk-dbus-task.c:2289
 msgid "Do you want to search for a suitable package now?"
 msgid_plural "Do you want to search for suitable packages now?"
 msgstr[0] "æ?¯å?¦è¦?æ?¥æ?¾å??é??ç??软件å???"
-msgstr[1] "æ?¯å?¦è¦?æ?¥æ?¾å??é??ç??软件å???"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:2299
 #, c-format
 msgid "%s wants to install a font"
 msgid_plural "%s wants to install fonts"
-msgstr[0] "%s é??è¦?å®?è£?ä¸?个å­?ä½?"
-msgstr[1] "%s é??è¦?å®?è£?ä¸?äº?å­?ä½?"
+msgstr[0] "%s é??è¦?å®?è£?å­?ä½?"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
 #: ../src/gpk-dbus-task.c:2302
 msgid "A program wants to install a font"
 msgid_plural "A program wants to install fonts"
-msgstr[0] "æ??个ç¨?åº?é??è¦?å®?è£?ä¸?个å­?ä½?"
-msgstr[1] "æ??个ç¨?åº?é??è¦?å®?è£?ä¸?äº?å­?ä½?"
+msgstr[0] "æ??个ç¨?åº?é??è¦?å®?è£?å­?ä½?"
 
 #. TRANSLATORS: title to show when searching for font files
 #: ../src/gpk-dbus-task.c:2318
 msgid "Searching for font"
 msgid_plural "Searching for fonts"
 msgstr[0] "正�����"
-msgstr[1] "正�����"
 
 #: ../src/gpk-dbus-task.c:2356
 msgid "Could not process catalog"
@@ -1552,13 +1493,12 @@ msgstr "以ä¸?软件å??å°?å?¨ç?®å½?中æ ?记为å?³å°?å®?è£?:"
 #. TRANSLATORS: error: failed to remove, detailed error follows
 #: ../src/gpk-dbus-task.c:2435
 msgid "Failed to remove package"
-msgstr "移é?¤è½¯ä»¶å??失败"
+msgstr "å? é?¤è½¯ä»¶å??失败"
 
 #: ../src/gpk-dbus-task.c:2512
 msgid "Install the following driver"
 msgid_plural "Install the following drivers"
-msgstr[0] "��以�驱���"
-msgstr[1] "��以�驱���"
+msgstr[0] "��以�驱�"
 
 #. TRANSLATORS: title: removing packages
 #. TRANSLATORS: transaction state, removing packages
@@ -1575,30 +1515,26 @@ msgstr "æ?¥æ?¾å?«æ??æ­¤æ??件ç??软件å??失败"
 #: ../src/gpk-dbus-task.c:2797
 msgid "The following file will be removed:"
 msgid_plural "The following files will be removed:"
-msgstr[0] "以ä¸?æ??件å°?移é?¤:"
-msgstr[1] "以ä¸?æ??件å°?移é?¤:"
+msgstr[0] "以ä¸?æ??件å°?å? é?¤:"
 
 #. TRANSLATORS: confirm with the user
 #: ../src/gpk-dbus-task.c:2800
 msgid "Do you want to remove this file now?"
 msgid_plural "Do you want to remove these files now?"
-msgstr[0] "æ?¯å?¦è¦?ç«?å?³å? é?¤æ­¤æ??件?"
-msgstr[1] "æ?¯å?¦è¦?ç«?å?³å? é?¤è¿?äº?æ??件?"
+msgstr[0] "æ?¯å?¦è¦?ç«?å?³å? é?¤ä»¥ä¸?æ??件?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
 #: ../src/gpk-dbus-task.c:2805
 #, c-format
 msgid "%s wants to remove a file"
 msgid_plural "%s wants to remove files"
-msgstr[0] "%s è¦?å? é?¤ä¸?个æ??件"
-msgstr[1] "%s è¦?å? é?¤ä¸?äº?æ??件"
+msgstr[0] "%s è¦?å? é?¤æ??件"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
 #: ../src/gpk-dbus-task.c:2808
 msgid "A program wants to remove a file"
 msgid_plural "A program wants to remove files"
-msgstr[0] "æ??ç¨?åº?è¦?å? é?¤ä¸?个æ??件"
-msgstr[1] "æ??ç¨?åº?è¦?å? é?¤ä¸?äº?æ??件"
+msgstr[0] "æ??ç¨?åº?è¦?å? é?¤æ??件"
 
 #. TRANSLATORS: button: confirm to search for packages
 #: ../src/gpk-dbus-task.c:2812
@@ -1609,8 +1545,7 @@ msgstr "å? é?¤"
 #: ../src/gpk-dbus-task.c:2865
 msgid "Do you want to install this catalog?"
 msgid_plural "Do you want to install these catalogs?"
-msgstr[0] "�����此��?"
-msgstr[1] "���������?"
+msgstr[0] "�����以���?"
 
 #. TRANSLATORS: title: install package catalogs, that is, instructions for installing
 #: ../src/gpk-dbus-task.c:2890
@@ -1908,11 +1843,11 @@ msgstr "����正������失败"
 
 #: ../src/gpk-enum.c:487
 msgid "The package database was changed"
-msgstr "软件å??æ?°æ?®åº?已被æ?´æ?¹"
+msgstr "软件å??æ?°æ?®åº?å·²æ?´æ?¹"
 
 #: ../src/gpk-enum.c:490
 msgid "Virtual provide type is not supported"
-msgstr "ä¸?æ?¯æ??è??æ??æ??ä¾?ç±»å??"
+msgstr "è??æ??å??å?«ç±»å??å°?ä¸?æ?¯æ??"
 
 #: ../src/gpk-enum.c:493
 msgid "Install root is invalid"
@@ -2328,7 +2263,7 @@ msgstr ""
 
 #: ../src/gpk-enum.c:732
 msgid "The package database was changed while the request was running."
-msgstr "请æ±?æ­£å?¨è¿?è¡?ç??æ?¶å??软件å??æ?°æ?®åº?被æ?´æ?¹ã??"
+msgstr "å?¨æ?§è¡?请æ±?è¿?ç¨?中软件å??æ?°æ?®åº?å·²æ?´æ?¹ã??"
 
 #: ../src/gpk-enum.c:735
 msgid "The virtual provide type is not supported by this system."
@@ -2336,7 +2271,7 @@ msgstr "此系ç»?ä¸?æ?¯æ??è??æ??æ??ä¾?ç±»å??ã??"
 
 #: ../src/gpk-enum.c:738
 msgid "The install root is invalid. Please contact your administrator."
-msgstr "å®?è£?æ ¹æ? æ??ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
+msgstr "å®?è£?æ ¹æ? æ??ï¼?请è??系系ç»?管ç??å??ã??"
 
 #: ../src/gpk-enum.c:756
 msgid "No restart is necessary."
@@ -2463,7 +2398,7 @@ msgstr "此软件æº?ä»?ä¾?å¼?å??è??使ç?¨"
 
 #: ../src/gpk-enum.c:891
 msgid "Other updates have been held back"
-msgstr "å?¶å®?æ?´æ?°å·²è¢«æ??å?¶ã??"
+msgstr "被ä¿?æ??è??æ?ªè¿?è¡?ç??å?¶ä»?æ?´æ?°"
 
 #. TRANSLATORS: This is when the transaction status is not known
 #: ../src/gpk-enum.c:909
@@ -2648,7 +2583,6 @@ msgstr "æ­£å?¨å¤?å?¶æ??件"
 msgid "%i trivial update"
 msgid_plural "%i trivial updates"
 msgstr[0] "%i 个���"
-msgstr[1] "%i 个���"
 
 #. TRANSLATORS: type of update in the case that we don't have any data
 #: ../src/gpk-enum.c:1075
@@ -2656,7 +2590,6 @@ msgstr[1] "%i 个���"
 msgid "%i update"
 msgid_plural "%i updates"
 msgstr[0] "%i 个��"
-msgstr[1] "%i 个��"
 
 #. TRANSLATORS: type of update
 #: ../src/gpk-enum.c:1079
@@ -2664,7 +2597,6 @@ msgstr[1] "%i 个��"
 msgid "%i important update"
 msgid_plural "%i important updates"
 msgstr[0] "%i 个é??è¦?æ?´æ?°"
-msgstr[1] "%i 个é??è¦?æ?´æ?°"
 
 #. TRANSLATORS: type of update
 #: ../src/gpk-enum.c:1083
@@ -2672,7 +2604,6 @@ msgstr[1] "%i 个é??è¦?æ?´æ?°"
 msgid "%i security update"
 msgid_plural "%i security updates"
 msgstr[0] "%i 个����"
-msgstr[1] "%i 个����"
 
 #. TRANSLATORS: type of update
 #: ../src/gpk-enum.c:1087
@@ -2680,7 +2611,6 @@ msgstr[1] "%i 个����"
 msgid "%i bug fix update"
 msgid_plural "%i bug fix updates"
 msgstr[0] "%i 个é??误修正æ?´æ?°"
-msgstr[1] "%i 个é??误修正æ?´æ?°"
 
 #. TRANSLATORS: type of update
 #: ../src/gpk-enum.c:1091
@@ -2688,7 +2618,6 @@ msgstr[1] "%i 个é??误修正æ?´æ?°"
 msgid "%i enhancement update"
 msgid_plural "%i enhancement updates"
 msgstr[0] "%i 个�强��"
-msgstr[1] "%i 个�强��"
 
 #. TRANSLATORS: number of updates that cannot be installed due to deps
 #: ../src/gpk-enum.c:1095
@@ -2696,7 +2625,6 @@ msgstr[1] "%i 个�强��"
 msgid "%i blocked update"
 msgid_plural "%i blocked updates"
 msgstr[0] "%i 个æ? æ³?è¿?è¡?ç??æ?´æ?°"
-msgstr[1] "%i 个æ? æ³?è¿?è¡?ç??æ?´æ?°"
 
 #. TRANSLATORS: The type of update
 #: ../src/gpk-enum.c:1113
@@ -3439,75 +3367,71 @@ msgstr "继续"
 #. TRANSLATORS: additional message text for the deps dialog
 #: ../src/gpk-task.c:400
 msgid "The following software also needs to be installed"
-msgstr "以ä¸?软件亦é??è¦?被å®?è£?"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?è¿?é??è¦?å®?è£?以ä¸?软件"
 
 #. TRANSLATORS: additional message text for the deps dialog
 #: ../src/gpk-task.c:405
 msgid "The following software also needs to be removed"
-msgstr "以ä¸?软件亦é??è¦?被移é?¤"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?è¿?é??è¦?å? é?¤ä»¥ä¸?软件"
 
 #. TRANSLATORS: additional message text for the deps dialog
 #: ../src/gpk-task.c:409
 msgid "The following software also needs to be updated"
-msgstr "以ä¸?软件亦é??è¦?被æ?´æ?°"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?以ä¸?软件é??è¦?æ?´æ?°"
 
 #. TRANSLATORS: additional message text for the deps dialog
 #: ../src/gpk-task.c:413
 msgid "The following software also needs to be re-installed"
-msgstr "以ä¸?软件亦é??è¦?被é??æ?°å®?è£?"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?以ä¸?软件é??è¦?é??æ?°å®?è£?"
 
 #. TRANSLATORS: additional message text for the deps dialog
 #: ../src/gpk-task.c:417
 msgid "The following software also needs to be downgraded"
-msgstr "以ä¸?软件亦é??è¦?被é??级"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?以ä¸?软件é??è¦?é??级"
 
 #. TRANSLATORS: additional message text for the deps dialog (we don't know how it's going to be processed -- eeek)
 #: ../src/gpk-task.c:421
 msgid "The following software also needs to be processed"
-msgstr "以ä¸?软件亦é??è¦?被å¤?ç??"
+msgstr "为äº?满足ä¾?èµ?å?³ç³»ï¼?以ä¸?软件é??è¦?å¤?ç??"
 
 #. TRANSLATORS: title of a dependency dialog
 #: ../src/gpk-task.c:480
 msgid "Additional confirmation required"
-msgstr "é??è¦?é??å? ç¡®è®¤"
+msgstr "é??è¦?é¢?å¤?ç??确认"
 
 #. TRANSLATORS: message text of a dependency dialog
 #: ../src/gpk-task.c:486
 msgid "To install this package, additional software also has to be modified."
 msgid_plural ""
 "To install these packages, additional software also has to be modified."
-msgstr[0] "欲å®?è£?此软件å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
-msgstr[1] "欲å®?è£?è¿?äº?软件å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
+msgstr[0] "欲å®?è£?以ä¸?软件å??ï¼?æ??å?¶ä»?软件é??è¦?被修æ?¹ã??"
 
 #. TRANSLATORS: message text of a dependency dialog
 #: ../src/gpk-task.c:491
 msgid "To remove this package, additional software also has to be modified."
 msgid_plural ""
 "To remove these packages, additional software also has to be modified."
-msgstr[0] "欲å? é?¤æ­¤è½¯ä»¶å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
-msgstr[1] "欲å? é?¤è¿?äº?软件å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
+msgstr[0] "欲å? é?¤ä»¥ä¸?软件å??ï¼?æ??å?¶ä»?软件é??è¦?被修æ?¹ã??"
 
 #. TRANSLATORS: message text of a dependency dialog
 #: ../src/gpk-task.c:496
 msgid "To update this package, additional software also has to be modified."
 msgid_plural ""
 "To update these packages, additional software also has to be modified."
-msgstr[0] "欲æ?´æ?°æ­¤è½¯ä»¶å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
-msgstr[1] "欲æ?´æ?°è¿?äº?软件å??ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
+msgstr[0] "欲æ?´æ?°ä»¥ä¸?软件å??ï¼?æ??å?¶ä»?软件é??è¦?被修æ?¹ã??"
 
 #. TRANSLATORS: message text of a dependency dialog
 #: ../src/gpk-task.c:501
 msgid "To install this file, additional software also has to be modified."
 msgid_plural ""
 "To install these file, additional software also has to be modified."
-msgstr[0] "欲å®?è£?æ­¤æ??件ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
-msgstr[1] "欲å®?è£?è¿?äº?æ??件ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
+msgstr[0] "欲å®?è£?以ä¸?æ??件ï¼?æ??å?¶ä»?软件é??è¦?被修æ?¹ã??"
 
 #. TRANSLATORS: message text of a dependency dialog
 #: ../src/gpk-task.c:506
 msgid ""
 "To process this transaction, additional software also has to be modified."
-msgstr "è¦?è¿?è¡?æ­¤å¤?ç??è¿?ç¨?ï¼?é??å? è½¯ä»¶å¿?é¡»è¦?被æ?´æ?¹ã??"
+msgstr "è¦?è¿?è¡?æ­¤å¤?ç??è¿?ç¨?ï¼?æ??å?¶ä»?软件é??è¦?被修æ?¹ã??"
 
 #. TRANSLATORS: button label, force the install, even though it's untrusted
 #: ../src/gpk-task.c:592
@@ -3806,17 +3730,17 @@ msgstr "软件å??æ?°ç»?æ??件"
 msgid "Service pack files"
 msgstr "æ??å?¡å??æ??件"
 
-#: ../src/gpk-update-icon.c:76
+#: ../src/gpk-update-icon.c:77
 msgid "Exit after a small delay"
 msgstr "ä¸?段延è¿?å??é??å?º"
 
 #. TRANSLATORS: program name, a session wide daemon to watch for updates and changing system state
-#: ../src/gpk-update-icon.c:96 ../src/gpk-update-icon.c:98
+#: ../src/gpk-update-icon.c:97 ../src/gpk-update-icon.c:99
 msgid "Update Applet"
 msgstr "�������"
 
 #. TRANSLATORS: title to pass to to the user if there are not enough privs
-#: ../src/gpk-update-icon.c:111
+#: ../src/gpk-update-icon.c:112
 msgid "Update applet"
 msgstr "�������"
 
@@ -3923,8 +3847,7 @@ msgid ""
 msgid_plural ""
 "Connectivity is being provided by wireless broadband, and it may be "
 "expensive to update these packages."
-msgstr[0] "è¿?æ?¥æ­£å?¨ç?±æ? çº¿å®½å¸¦æ??ä¾?ï¼?æ?´æ?°æ­¤è½¯ä»¶å??产ç??ç??è´¹ç?¨å?¯è?½è¾?é«?ã??"
-msgstr[1] "è¿?æ?¥æ­£å?¨ç?±æ? çº¿å®½å¸¦æ??ä¾?ï¼?æ?´æ?°è¿?äº?软件å??产ç??ç??è´¹ç?¨å?¯è?½è¾?é«?ã??"
+msgstr[0] "è¿?æ?¥æ­£å?¨ç?±æ? çº¿å®½å¸¦æ??ä¾?ï¼?æ?´æ?°è½¯ä»¶å??产ç??ç??è¾?å¤?è´¹ç?¨ã??"
 
 #. TRANSLATORS: there are no updates
 #: ../src/gpk-update-viewer.c:1417
@@ -3939,14 +3862,13 @@ msgstr "�����"
 #. TRANSLATORS: no network connnection, according to PackageKit
 #: ../src/gpk-update-viewer.c:1481
 msgid "No network connection was detected."
-msgstr "��������"
+msgstr "æ?ªæ£?æµ?å?°ç½?ç»?è¿?æ?¥ã??"
 
 #. TRANSLATORS: this is the button text when we have updates
 #: ../src/gpk-update-viewer.c:1498
 msgid "_Install Update"
 msgid_plural "_Install Updates"
 msgstr[0] "����(_I)"
-msgstr[1] "����(_I)"
 
 #. TRANSLATORS: title: nothing to do
 #: ../src/gpk-update-viewer.c:1506
@@ -3963,7 +3885,6 @@ msgstr "ç?°å?¨æ²¡æ??é??对æ?¨ç??计ç®?æ?ºç??å?¯ç?¨æ?´æ?°ã??"
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "%i 个����"
-msgstr[1] "%i 个����"
 
 #. TRANSLATORS: how many updates are selected in the UI
 #: ../src/gpk-update-viewer.c:1550
@@ -3971,7 +3892,6 @@ msgstr[1] "%i 个����"
 msgid "%i update selected"
 msgid_plural "%i updates selected"
 msgstr[0] "å·²é??å®? %i 个æ?´æ?°"
-msgstr[1] "å·²é??å®? %i 个æ?´æ?°"
 
 #. TRANSLATORS: how many updates are selected in the UI, and the size of packages to download
 #: ../src/gpk-update-viewer.c:1558
@@ -3979,7 +3899,6 @@ msgstr[1] "å·²é??å®? %i 个æ?´æ?°"
 msgid "%i update selected (%s)"
 msgid_plural "%i updates selected (%s)"
 msgstr[0] "å·²é??å®? %i 个æ?´æ?° (%s)"
-msgstr[1] "å·²é??å®? %i 个æ?´æ?° (%s)"
 
 #. TRANSLATORS: a column that has name of the package that will be updated
 #: ../src/gpk-update-viewer.c:1752
@@ -4030,7 +3949,6 @@ msgid "For more information about this update please visit this website:"
 msgid_plural ""
 "For more information about this update please visit these websites:"
 msgstr[0] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤æ?´æ?°ç??ä¿¡æ?¯:"
-msgstr[1] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤æ?´æ?°ç??ä¿¡æ?¯:"
 
 #. TRANSLATORS: this is a array of bugzilla URLs
 #: ../src/gpk-update-viewer.c:2033
@@ -4041,7 +3959,6 @@ msgid_plural ""
 "For more information about bugs fixed by this update please visit these "
 "websites:"
 msgstr[0] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤æ?´æ?°æ??修正ç??é??误ç??ä¿¡æ?¯:"
-msgstr[1] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤æ?´æ?°æ??修正ç??é??误ç??ä¿¡æ?¯:"
 
 #. TRANSLATORS: this is a array of CVE (security) URLs
 #: ../src/gpk-update-viewer.c:2041
@@ -4050,7 +3967,6 @@ msgid ""
 msgid_plural ""
 "For more information about this security update please visit these websites:"
 msgstr[0] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤å®?å?¨æ?´æ?°ç??ä¿¡æ?¯:"
-msgstr[1] "请å??é??以ä¸?ç½?ç«?以è?·å??æ?´å¤?å?³äº?æ­¤å®?å?¨æ?´æ?°ç??ä¿¡æ?¯:"
 
 #. TRANSLATORS: reboot required
 #: ../src/gpk-update-viewer.c:2050
@@ -4106,7 +4022,7 @@ msgstr "æ? æ³?è?·å??软件å??详ç»?ä¿¡æ?¯"
 
 #: ../src/gpk-update-viewer.c:2171 ../src/gpk-update-viewer.c:2270
 msgid "No results were returned."
-msgstr "æ?ªè¿?å??ä»»ä½?ç»?æ??ã??"
+msgstr "æ? è¿?å??ç»?æ??ã??"
 
 #. TRANSLATORS: right click menu, select all the updates
 #: ../src/gpk-update-viewer.c:2505
@@ -4154,7 +4070,7 @@ msgstr "å??è¡?ç??å??级 '%s' å?¯ç?¨"
 msgid ""
 "Other updates are held back as some important system packages need to be "
 "installed first."
-msgstr "ç?±äº?ä¸?äº?é??è¦?ç³»ç»?软件å??é??è¦?å??被å®?è£?ï¼?å?¶å®?æ?´æ?°æ??æ?¶è¢«æ??ç½®ã??"
+msgstr "被ä¿?æ??è??æ?ªè¿?è¡?ç??å?¶ä»?æ?´æ?°ï¼?æ??å?¶ä»?é??è¦?ç??ç³»ç»?软件å??é??è¦?å??æ?´æ?°ã??"
 
 #. TRANSLATORS: title to pass to to the user if there are not enough privs
 #: ../src/gpk-update-viewer-main.c:102
@@ -4170,89 +4086,42 @@ msgstr "请æ±?被å¤?ç??ä¹?å??ä¸?é??å?º"
 msgid "Session DBus service for PackageKit"
 msgstr "PackageKit ä¼?è¯? DBus æ??å?¡"
 
-#. TRANSLATORS: a list of packages is shown that need to restarted
-#: ../src/gpk-watch.c:158
-#, c-format
-msgid "This is due to the %s package being updated."
-msgid_plural "This is due to the following packages being updated: %s."
-msgstr[0] "è¿?æ?¯ç?±äº?软件å?? %s å°?被æ?´æ?°ã??"
-msgstr[1] "è¿?æ?¯ç?±äº?以ä¸?软件å??å°?被æ?´æ?°: %sã??"
-
-#. TRANSLATORS: over 5 packages require the system to be restarted, don't list them all here
-#: ../src/gpk-watch.c:162
-#, c-format
-msgid "This is because %i package has been updated."
-msgid_plural "This is because %i packages have been updated."
-msgstr[0] "è¿?æ?¯å? ä¸º %i 个软件å??己被æ?´æ?°ã??"
-msgstr[1] "è¿?æ?¯å? ä¸º %i 个软件å??己被æ?´æ?°ã??"
-
-#: ../src/gpk-watch.c:214
-#, c-format
-msgid "%i message from the package manager"
-msgid_plural "%i messages from the package manager"
-msgstr[0] "软件å??管ç??å?¨å?±æ?? %i æ?¡ä¿¡æ?¯"
-msgstr[1] "软件å??管ç??å?¨å?±æ?? %i æ?¡ä¿¡æ?¯"
-
-#: ../src/gpk-watch.c:398
+#: ../src/gpk-watch.c:112
 msgid "Package manager error details"
 msgstr "软件å??管ç??å?¨é??误详ç»?ä¿¡æ?¯"
 
-#: ../src/gpk-watch.c:523
-msgid "Package Manager Messages"
-msgstr "软件å??管ç??å?¨æ¶?æ?¯"
-
-#. TRANSLATORS: column for the message type
-#: ../src/gpk-watch.c:553
-msgid "Message"
-msgstr "ä¿¡æ?¯"
-
-#. TRANSLATORS: messages from the transaction
-#: ../src/gpk-watch.c:898
-msgid "_Show messages"
-msgstr "�示信�(_S)"
-
-#. TRANSLATORS: log out of the session
-#: ../src/gpk-watch.c:911
-msgid "_Log out"
-msgstr "注é??(_L)"
-
-#. TRANSLATORS: this menu item restarts the computer after an update
-#: ../src/gpk-watch.c:926
-msgid "_Restart computer"
-msgstr "é??æ?°å?¯å?¨è®¡ç®?æ?º(_R)"
-
-#. TRANSLATORS: This hides the 'restart required' icon
-#: ../src/gpk-watch.c:938
-msgid "_Hide this icon"
-msgstr "é??è??æ­¤å?¾æ ?(_H)"
-
-#. do the bubble
-#: ../src/gpk-watch.c:1360
-msgid "New package manager message"
-msgstr "æ?°ç??软件å??管ç??å?¨æ¶?æ?¯"
-
 #. TRANSLATORS: Prefix to the title shown in the libnotify popup
-#: ../src/gpk-watch.c:1417
+#: ../src/gpk-watch.c:598
 msgid "Package Manager"
 msgstr "软件å??管ç??å?¨"
 
+#. TRANSLATORS: log out of the session
+#: ../src/gpk-watch.c:701
+msgid "Log out"
+msgstr "注é??"
+
+#. TRANSLATORS: restart the computer
+#: ../src/gpk-watch.c:706
+msgid "Restart"
+msgstr "é??æ?°å?¯å?¨"
+
 #. TRANSLATORS: This is the message in the libnotify body
-#: ../src/gpk-watch.c:1586
+#: ../src/gpk-watch.c:811
 msgid "Packages have been removed"
 msgstr "å·²å? é?¤ç??软件å??"
 
 #. TRANSLATORS: This is the message in the libnotify body
-#: ../src/gpk-watch.c:1589
+#: ../src/gpk-watch.c:814
 msgid "Packages have been installed"
 msgstr "å·²å®?è£?ç??软件å??"
 
 #. TRANSLATORS: This is the message in the libnotify body
-#: ../src/gpk-watch.c:1592
+#: ../src/gpk-watch.c:817
 msgid "System has been updated"
 msgstr "系�已��"
 
 #. TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble
-#: ../src/gpk-watch.c:1599
+#: ../src/gpk-watch.c:824
 msgid "Task completed"
 msgstr "ä»»å?¡å·²å®?æ??"
 
@@ -4293,11 +4162,6 @@ msgstr "æ?¾ç¤ºè°?è¯?é??项"
 #~ msgid "Allow applications to invoke the mime type installer"
 #~ msgstr "å??许åº?ç?¨ç¨?åº?è°?ç?¨ mime ç±»å??å®?è£?ç¨?åº?"
 
-#~ msgid ""
-#~ "Allow the user to change the install root when processing packages, for "
-#~ "instance when using LTSP."
-#~ msgstr "å??许ç?¨æ?·å?¨å¤?ç??软件å??æ?¶æ?´æ?¹å®?è£?根路å¾?ï¼?ä¾?å¦?å½?使ç?¨ LTSP æ?¶ã??"
-
 #~ msgid "Ask the user if additional firmware should be installed"
 #~ msgstr "åº?å®?è£?é??å? å?ºä»¶æ?¶è¯¢é?®ç?¨æ?·"
 
@@ -4315,9 +4179,6 @@ msgstr "æ?¾ç¤ºè°?è¯?é??项"
 #~ "installing from a FUSE mount"
 #~ msgstr "ä»?ä¸?个 FUSE æ??è½½ç?¹å®?è£?æ?¶ï¼?åº?å°?æ??件å¤?å?°å?°é??ç§?æ??ç?®å½?æ?¶è¯¢é?®ç?¨æ?·"
 
-#~ msgid "Automatically remove unused dependencies"
-#~ msgstr "è?ªå?¨ç§»é?¤æ?ªä½¿ç?¨ç??ä¾?èµ?å?³ç³»"
-
 #~ msgid "Automatically update these types of updates"
 #~ msgstr "è?ªå?¨åº?ç?¨è¿?äº?ç±»å??ç??æ?´æ?°"
 
@@ -4515,12 +4376,6 @@ msgstr "æ?¾ç¤ºè°?è¯?é??项"
 #~ msgid "Show transactions that have the original application running"
 #~ msgstr "æ?¾ç¤ºå??åº?ç?¨ç¨?åº?æ­£å?¨è¿?è¡?中ç??å¤?ç??è¿?ç¨?"
 
-#~ msgid "The filenames on removable media that designate it important."
-#~ msgstr "å?¯ç§»å?¨åª?ä½?ä¸?æ ?æ??为é??è¦?ç??æ??件å??ã??"
-
-#~ msgid "The install root used when installing and removing packages."
-#~ msgstr "å®?è£?å??移é?¤è½¯ä»¶å??æ?¶æ??使ç?¨ç??根路å¾?ã??"
-
 #~ msgid ""
 #~ "The number of seconds at session startup to wait before checking for "
 #~ "updates"
@@ -4563,23 +4418,12 @@ msgstr "æ?¾ç¤ºè°?è¯?é??项"
 #~ "turned on"
 #~ msgstr "å½?ç?±ä¸?个ä¼?è¯? DBus 请æ±?æ?¾ç¤º UI æ?¶ï¼?强å?¶æ??å¼?è¿?äº?é??项"
 
-#~ msgid ""
-#~ "When removable media is inserted, it is checked to see if it contains any "
-#~ "important filenames in the root directory. If the filename matches, then "
-#~ "an updates check is performed. This allows post-install disks to be used "
-#~ "to update running systems."
-#~ msgstr ""
-#~ "å½?æ??å?¥å?¯ç§»å?¨åª?ä½?æ?¶ï¼?å°?æ£?æ?¥æ ¹ç?®å½?中æ?¯å?¦å?«æ??é??è¦?æ??件å??ã??å¦?æ??æ??件å??å?¹é??ï¼?å??å°?"
-#~ "è¿?è¡?æ?´æ?°æ£?æ?¥ã??è¿?å?¯ä»¥å??许å°?å®?è£?好ç??ç£?ç??ç?¨äº?æ?´æ?°æ­£å?¨è¿?è¡?ç??ç³»ç»?ã??"
-
-#~ msgid ""
-#~ "When removing a package, also remove those dependencies that are not "
-#~ "required by other packages"
-#~ msgstr "移é?¤ä¸?个软件å??ç??å??æ?¶äº¦ç§»é?¤å?¶å®?软件å??ä¸?é??è¦?ç??ä¾?èµ?å?³ç³»"
-
 #~ msgid "Enable or disable software sources"
 #~ msgstr "å?¯ç?¨æ??ç¦?ç?¨è½¯ä»¶æº?"
 
+#~ msgid "Shows more software sources that may be interesting"
+#~ msgstr "�示��"
+
 #~ msgid "Failed to show url"
 #~ msgstr "�示 URL 失败"
 
@@ -4589,19 +4433,19 @@ msgstr "æ?¾ç¤ºè°?è¯?é??项"
 #~ msgid "Software source viewer"
 #~ msgstr "软件æº?æ?¥ç??å?¨"
 
-#~ msgid "Internal error"
-#~ msgstr "å??é?¨é??误"
+#~ msgid "This is due to the %s package being updated."
+#~ msgid_plural "This is due to the following packages being updated: %s."
+#~ msgstr[0] "è¿?æ?¯ç?±äº?以ä¸?软件å??å°?被æ?´æ?°: %sã??"
 
-#~ msgid "and %d other security update"
-#~ msgid_plural "and %d other security updates"
-#~ msgstr[0] "以å?? %d 个å?¶å®?å®?å?¨æ?´æ?°"
-#~ msgstr[1] "以å?? %d 个å?¶å®?å®?å?¨æ?´æ?°"
+#~ msgid "This is because %i package has been updated."
+#~ msgid_plural "This is because %i packages have been updated."
+#~ msgstr[0] "è¿?æ?¯å? ä¸º %i 个软件å??己被æ?´æ?°ã??"
 
-#~ msgid "Additional software will be installed"
-#~ msgstr "é??å? è½¯ä»¶å°?被å®?è£?"
+#~ msgid "Internal error"
+#~ msgstr "å??é?¨é??误"
 
-#~ msgid "Additional software will be removed"
-#~ msgstr "é??å? è½¯ä»¶å°?被å? é?¤"
+#~ msgid "_Restart computer"
+#~ msgstr "é??æ?°å?¯å?¨è®¡ç®?æ?º(_R)"
 
-#~ msgid "Additional software required"
-#~ msgstr "é??è¦?é??å? è½¯ä»¶"
+#~ msgid "_Hide this icon"
+#~ msgstr "é??è??æ­¤å?¾æ ?(_H)"



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