sync with code

1 files changed, 178 insertions, 75 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 59ff691c..fc133cec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-12 15:31+0100\n"
+"POT-Creation-Date: 2014-02-03 21:41+0100\n"
 "PO-Revision-Date: 2013-03-26 20:47+0800\n"
 "Last-Translator: tuhaihe <1132321739qq@gmail.com>\n"
 "Language-Team: Mageia Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -19,65 +19,65 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mgaapplet:79
+#: ../mgaapplet:82
 #, c-format
 msgid "Will check updates at %s"
 msgstr "将在 %s 检查更新"
 
-#: ../mgaapplet:87
+#: ../mgaapplet:90
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mgaapplet:92
+#: ../mgaapplet:95
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mageiaonline.com"
 
-#: ../mgaapplet:98
+#: ../mgaapplet:101
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在查找可用的软件包，请稍等..."
 
-#: ../mgaapplet:103
+#: ../mgaapplet:106
 #, c-format
 msgid "New updates are available for your system"
 msgstr "系统现有可用的更新"
 
-#: ../mgaapplet:109
+#: ../mgaapplet:112
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia 系统已经发布了新版本"
 
-#: ../mgaapplet:120
+#: ../mgaapplet:123
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mgaapplet:126
+#: ../mgaapplet:129
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mgaapplet:131 ../mgaapplet:137
+#: ../mgaapplet:134 ../mgaapplet:140
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../mgaapplet:142
+#: ../mgaapplet:145
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mgaapplet:147
+#: ../mgaapplet:150
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "未找到介质。您必须通过“软件介质管理器”添加介质。"
 
-#: ../mgaapplet:152
+#: ../mgaapplet:155
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,236 +93,236 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../mgaapplet:157
+#: ../mgaapplet:160
 #, c-format
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../mgaapplet:170
-#, c-format
-msgid "Error updating media"
-msgstr "更新介质出错"
-
-#: ../mgaapplet:200 ../mgaapplet:811
+#: ../mgaapplet:166 ../mgaapplet:688
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mgaapplet:201
+#: ../mgaapplet:167
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mgaapplet:202
+#: ../mgaapplet:168
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mgaapplet:203
+#: ../mgaapplet:169
 #, c-format
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mgaapplet:375
+#: ../mgaapplet:343
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr "已收到终止信号(升级或许已经完成)，请重启小程序。"
 
-#: ../mgaapplet:382
+#: ../mgaapplet:350
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "启动 Mageia 网络中心\n"
 
-#: ../mgaapplet:389 ../mgaapplet:465 ../mgaapplet:526
+#: ../mgaapplet:357 ../mgaapplet:433 ../mgaapplet:494
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia 系统新版本"
 
-#: ../mgaapplet:394
+#: ../mgaapplet:362
 #, c-format
 msgid "Browse"
 msgstr "浏览"
 
-#: ../mgaapplet:398 ../mgaapplet_gui.pm:212
+#: ../mgaapplet:366 ../mgaapplet-upgrade-helper:89
+#: ../mgaapplet-upgrade-helper:137 ../mgaapplet-upgrade-helper:170
+#: ../mgaapplet-upgrade-helper:176 ../mgaapplet-upgrade-helper:224
+#: ../mgaapplet-upgrade-helper:283 ../mgaapplet_gui.pm:211
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../mgaapplet:398
+#: ../mgaapplet:366
 #, c-format
 msgid "You must choose a directory owned by the super administrator!"
 msgstr "您必须选择一个由超级管理员拥有的目录！"
 
-#: ../mgaapplet:405
+#: ../mgaapplet:373
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia 系统已发布新版本。"
 
-#: ../mgaapplet:407 ../mgaapplet:477
+#: ../mgaapplet:375 ../mgaapplet:445
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mgaapplet:409 ../mgaapplet:471
+#: ../mgaapplet:377 ../mgaapplet:439
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您想要升级到“%s”系统？"
 
-#: ../mgaapplet:411 ../mgaapplet:481
+#: ../mgaapplet:379 ../mgaapplet:449
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不再询问"
 
-#: ../mgaapplet:412
+#: ../mgaapplet:380
 #, c-format
 msgid "Download all packages at once"
 msgstr "立即下载全部软件包"
 
-#: ../mgaapplet:413
+#: ../mgaapplet:381
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(警告：需要大量空闲空间)"
 
-#: ../mgaapplet:418
+#: ../mgaapplet:386
 #, c-format
 msgid "Where to download packages:"
 msgstr "软件包下载地址："
 
-#: ../mgaapplet:421 ../mgaapplet:486 ../mgaapplet:552 ../mgaapplet_gui.pm:200
+#: ../mgaapplet:389 ../mgaapplet:454 ../mgaapplet:520 ../mgaapplet_gui.pm:199
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mgaapplet:421 ../mgaapplet:486 ../mgaapplet:552 ../mgaapplet_gui.pm:200
+#: ../mgaapplet:389 ../mgaapplet:454 ../mgaapplet:520
+#: ../mgaapplet-upgrade-helper:143 ../mgaapplet-upgrade-helper:159
+#: ../mgaapplet_gui.pm:199
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mgaapplet:438
+#: ../mgaapplet:406
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr "该版本 Mageia 系统维护周期已过。此后不再为该系统提供任何更新。"
 
-#: ../mgaapplet:444
+#: ../mgaapplet:412
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "为了保持您的系统安全，您可以："
 
-#: ../mgaapplet:450
+#: ../mgaapplet:418
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mgaapplet:451
+#: ../mgaapplet:419
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "您应该将 %s 系统升级到新版本。"
 
-#: ../mgaapplet:460
+#: ../mgaapplet:428
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "您的版本已经不再支持"
 
-#: ../mgaapplet:543
+#: ../mgaapplet:511
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mgaapplet:545
+#: ../mgaapplet:513
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "预计下载数据为 %s"
 
-#: ../mgaapplet:546
+#: ../mgaapplet:514
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭其它正在运行的应用程序。"
 
-#: ../mgaapplet:549
+#: ../mgaapplet:517
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可以，您应该将笔记本电源模式调为电源供电，并且使用高速有线连接。"
 
-#: ../mgaapplet:583
+#: ../mgaapplet:551
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "正在启动 MageiaUpdate\n"
 
-#: ../mgaapplet:617
+#: ../mgaapplet:569
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在计算更新...\n"
 
-#: ../mgaapplet:730
+#: ../mgaapplet:607
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "正在检查网络：似乎已禁用\n"
 
-#: ../mgaapplet:757
+#: ../mgaapplet:634
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mgaapplet:758 ../mgaapplet:759
+#: ../mgaapplet:635 ../mgaapplet:636
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权所有 (C) %s %s"
 
-#: ../mgaapplet:762
+#: ../mgaapplet:639
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online 可访问 Mageia Web 服务。"
 
-#: ../mgaapplet:764
+#: ../mgaapplet:641
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mgaapplet:769
+#: ../mgaapplet:645
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "汤诗语 <shiyu@mandriva.org>\n"
 "tuhaihe <1132321739qq@gmail.com>\n"
 
-#: ../mgaapplet:797
+#: ../mgaapplet:674
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mgaapplet:800 ../mgaapplet:805 ../mgaapplet_gui.pm:232
+#: ../mgaapplet:677 ../mgaapplet:682 ../mgaapplet_gui.pm:231
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mgaapplet:813
+#: ../mgaapplet:690
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mgaapplet:828
+#: ../mgaapplet:708
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mgaapplet:830 ../mgaapplet-config:68
+#: ../mgaapplet:710 ../mgaapplet-config:66
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mgaapplet:832
+#: ../mgaapplet:712
 #, c-format
 msgid "Always launch on startup"
 msgstr "总是开机启动"
 
-#: ../mgaapplet:834
+#: ../mgaapplet:714
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -332,52 +332,149 @@ msgstr "退出"
 msgid "Adding an additional package medium"
 msgstr "添加额外的软件包介质"
 
-#: ../mgaapplet-config:69
+#: ../mgaapplet-config:67
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "您可以在此配置更新小程序"
 
-#: ../mgaapplet-config:71
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "更新频率(小时)"
 
-#: ../mgaapplet-config:80
+#: ../mgaapplet-config:77
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "第一次检查延迟(分钟)"
 
-#: ../mgaapplet-config:89
+#: ../mgaapplet-config:85
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "检查新的“%s”版本"
 
-#: ../mgaapplet_gui.pm:181
+#: ../mgaapplet-upgrade-helper:86
+#, c-format
+msgid ""
+"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:141 ../mgaapplet-upgrade-helper:225
+#: ../mgaapplet-upgrade-helper:284
+#, c-format
+msgid "Installation failed"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:142
+#, c-format
+msgid "Installation logs can be found in '%s'"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:143
+#, c-format
+msgid "Retry"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:152
+#, c-format
+msgid "Congratulations"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:156
+#, c-format
+msgid "Upgrade to Mageia %s release was successfull."
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:158
+#, c-format
+msgid "You must restart your system."
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:159
+#, c-format
+msgid "Reboot"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:170
+#, c-format
+msgid "Unable to download distro list"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:176
+#, c-format
+msgid "Distribution version %s was not found in the update list"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:185
+#, c-format
+msgid "Preparation Required"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:185
+#, c-format
+msgid ""
+"In order to upgrade, your current installation needs to be prepared.\n"
+"\n"
+"Do you wish to do this preparation now?"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:196
+#, c-format
+msgid ""
+"Further action is required before you can continue.\n"
+"\n"
+"Please see %s for more information."
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:197
+#, c-format
+msgid "Next Steps"
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:227
+#, c-format
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+
+#: ../mgaapplet-upgrade-helper:285
+#, fuzzy, c-format
+msgid "Failure when adding medium"
+msgstr "添加介质时发生了错误"
+
+#: ../mgaapplet.pm:18
+#, c-format
+msgid "Error updating media"
+msgstr "更新介质出错"
+
+#: ../mgaapplet_gui.pm:180
 #, c-format
 msgid "More information on your user account"
 msgstr "关于您用户帐号的更多信息"
 
-#: ../mgaapplet_gui.pm:188
+#: ../mgaapplet_gui.pm:187
 #, c-format
 msgid "Your email"
 msgstr "您的邮件"
 
-#: ../mgaapplet_gui.pm:189
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your password"
 msgstr "您的密码"
 
-#: ../mgaapplet_gui.pm:196
+#: ../mgaapplet_gui.pm:195
 #, c-format
 msgid "Forgotten password"
 msgstr "忘记密码"
 
-#: ../mgaapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:212
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密码和邮件不能为空。"
 
-#: ../mgaapplet_gui.pm:235
+#: ../mgaapplet_gui.pm:234
 #, c-format
 msgid "Close"
 msgstr "关闭"
@@ -489,6 +586,15 @@ msgstr "正在启动 MageiaUpdate\n"
 msgid "Authentication is required to run Mageia Updater"
 msgstr ""
 
+#: ../polkit/org.mageia.urpmi.update.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Package Media Updater"
+msgstr "正在启动 MageiaUpdate\n"
+
+#: ../polkit/org.mageia.urpmi.update.policy.in.h:2
+msgid "Authentication is required to run Mageia Package Media Updater"
+msgstr ""
+
 #~ msgid "System is up-to-date\n"
 #~ msgstr "系统已为最新\n"
 
@@ -551,9 +657,6 @@ msgstr ""
 #~ msgid "Your Mageia account does not have %s download subscription enabled."
 #~ msgstr "您的 Mageia 账户没有启用 %s 下载订阅服务。"
 
-#~ msgid "An error occurred while adding medium"
-#~ msgstr "添加介质时发生了错误"
-
 #~ msgid "Successfully added media!"
 #~ msgstr "成功添加了介质!"