summaryrefslogtreecommitdiffstats
path: root/tde-i18n-zh_CN/messages/tdebase
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-29 03:08:03 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-29 03:08:03 -0500
commit242434109c14a494dee7738b9c343f5947d20506 (patch)
treeea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-zh_CN/messages/tdebase
parent8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
downloadtde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
Automated l10n update (.po files)
Diffstat (limited to 'tde-i18n-zh_CN/messages/tdebase')
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/appletproxy.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/clockapplet.po221
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/display.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/dockbarextension.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/drkonqi.po143
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/extensionproxy.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/filetypes.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/htmlsearch.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/joystick.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kaccess.po7
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kappfinder.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kasbarextension.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kate.po2016
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kay.po35
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmaccess.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmarts.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmbackground.po157
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmbell.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmcgi.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmcolors.po10
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po105
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmcss.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmenergy.po42
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmfonts.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmicons.po78
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcminfo.po76
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcminput.po172
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkclock.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkded.po11
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkeys.po375
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkicker.po715
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkonq.po178
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po477
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po250
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po12
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmkwm.po423
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmlayout.po296
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmlocale.po44
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmmedia.po290
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmnic.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmnotify.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmperformance.po12
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmsamba.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po93
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po7
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po106
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmstyle.po193
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po362
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po171
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po26
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po215
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po16
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmusb.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmview1394.po13
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcontrol.po56
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kdcop.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kdesktop.po755
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kdialog.po9
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kfindpart.po11
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kfmclient.po39
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po19
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po23
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/khelpcenter.po108
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/khotkeys.po33
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kicker.po680
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kjobviewer.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/klipper.po95
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po5
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kmenuedit.po19
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po59
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/knetattach.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/konqueror.po1044
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/konsole.po477
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kpager.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po493
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kprinter.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/krdb.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kreadconfig.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/krunapplet.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksmserver.po208
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksplash.po12
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kstart.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po19
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kthememanager.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ktip.po498
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kxkb.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libdmctl.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkicker.po435
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po7
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libkonq.po79
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libtaskbar.po351
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po43
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/lockout.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/mediaapplet.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/nsplugin.po21
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/privacy.po54
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/quicklauncher.po145
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po39
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdefontinst.po129
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_home.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_man.po57
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_media.po448
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_print.po11
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po11
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po259
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po9
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_system.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po21
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po61
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdepasswd.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po337
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tderandr.po347
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po21
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdesu.po77
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdesud.po9
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdmconfig.po174
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdmgreet.po660
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/trashapplet.po3
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/twin.po535
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/twin_clients.po434
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/twin_lib.po56
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/useraccount.po5
154 files changed, 10371 insertions, 6707 deletions
diff --git a/tde-i18n-zh_CN/messages/tdebase/appletproxy.po b/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
index 9f39d60fb34..6cecc01c66a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: appletproxy\n"
-"POT-Creation-Date: 2006-04-09 03:51+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-23 18:26+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/clockapplet.po b/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
index 2e1bf04c88d..18aaf3ee156 100644
--- a/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
@@ -6,351 +6,352 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-13 07:54+0800\n"
"Last-Translator: Dick Zhang <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: clock.cpp:93
+#: clock.cpp:83
msgid "Configure - Clock"
msgstr "配置 - 时钟"
-#: clock.cpp:136
+#: clock.cpp:126
msgid "General"
msgstr "常规"
-#: clock.cpp:680
+#: clock.cpp:697
msgid ""
"_: hour\n"
"one"
msgstr "一点"
-#: clock.cpp:680
+#: clock.cpp:697
msgid ""
"_: hour\n"
"two"
msgstr "二点"
-#: clock.cpp:681
+#: clock.cpp:698
msgid ""
"_: hour\n"
"three"
msgstr "三点"
-#: clock.cpp:681
+#: clock.cpp:698
msgid ""
"_: hour\n"
"four"
msgstr "四点"
-#: clock.cpp:681
+#: clock.cpp:698
msgid ""
"_: hour\n"
"five"
msgstr "五点"
-#: clock.cpp:682
+#: clock.cpp:699
msgid ""
"_: hour\n"
"six"
msgstr "六点"
-#: clock.cpp:682
+#: clock.cpp:699
msgid ""
"_: hour\n"
"seven"
msgstr "七点"
-#: clock.cpp:682
+#: clock.cpp:699
msgid ""
"_: hour\n"
"eight"
msgstr "八点"
-#: clock.cpp:683
+#: clock.cpp:700
msgid ""
"_: hour\n"
"nine"
msgstr "九点"
-#: clock.cpp:683
+#: clock.cpp:700
msgid ""
"_: hour\n"
"ten"
msgstr "十点"
-#: clock.cpp:683
+#: clock.cpp:700
msgid ""
"_: hour\n"
"eleven"
msgstr "十一点"
-#: clock.cpp:684
+#: clock.cpp:701
msgid ""
"_: hour\n"
"twelve"
msgstr "十二点"
-#: clock.cpp:687
+#: clock.cpp:704
#, no-c-format
msgid "%0 o'clock"
msgstr "%0整"
-#: clock.cpp:688
+#: clock.cpp:705
#, no-c-format
msgid "five past %0"
msgstr "%0五分"
-#: clock.cpp:689
+#: clock.cpp:706
#, no-c-format
msgid "ten past %0"
msgstr "%0十分"
-#: clock.cpp:690
+#: clock.cpp:707
#, no-c-format
msgid "quarter past %0"
msgstr "%0一刻"
-#: clock.cpp:691
+#: clock.cpp:708
#, no-c-format
msgid "twenty past %0"
msgstr "%0二十"
-#: clock.cpp:692
+#: clock.cpp:709
#, no-c-format
msgid "twenty five past %0"
msgstr "%0二十五"
-#: clock.cpp:693
+#: clock.cpp:710
#, no-c-format
msgid "half past %0"
msgstr "%0半"
-#: clock.cpp:694
+#: clock.cpp:711
#, no-c-format
msgid "twenty five to %1"
msgstr "差二十五分%1"
-#: clock.cpp:695
+#: clock.cpp:712
#, no-c-format
msgid "twenty to %1"
msgstr "差二十分%1"
-#: clock.cpp:696
+#: clock.cpp:713
#, no-c-format
msgid "quarter to %1"
msgstr "差一刻%1"
-#: clock.cpp:697
+#: clock.cpp:714
#, no-c-format
msgid "ten to %1"
msgstr "差十分%1"
-#: clock.cpp:698
+#: clock.cpp:715
#, no-c-format
msgid "five to %1"
msgstr "差五分%1"
-#: clock.cpp:699
+#: clock.cpp:716
#, no-c-format
msgid "%1 o'clock"
msgstr "%1整"
-#: clock.cpp:702
+#: clock.cpp:719
#, no-c-format
msgid ""
"_: one\n"
"%0 o'clock"
msgstr "%0整"
-#: clock.cpp:703
+#: clock.cpp:720
#, no-c-format
msgid ""
"_: one\n"
"five past %0"
msgstr "%0五分"
-#: clock.cpp:704
+#: clock.cpp:721
#, no-c-format
msgid ""
"_: one\n"
"ten past %0"
msgstr "%0十分"
-#: clock.cpp:705
+#: clock.cpp:722
#, no-c-format
msgid ""
"_: one\n"
"quarter past %0"
msgstr "%0一刻"
-#: clock.cpp:706
+#: clock.cpp:723
#, no-c-format
msgid ""
"_: one\n"
"twenty past %0"
msgstr "%0二十"
-#: clock.cpp:707
+#: clock.cpp:724
#, no-c-format
msgid ""
"_: one\n"
"twenty five past %0"
msgstr "%0二十五"
-#: clock.cpp:708
+#: clock.cpp:725
#, no-c-format
msgid ""
"_: one\n"
"half past %0"
msgstr "%0半"
-#: clock.cpp:709
+#: clock.cpp:726
#, no-c-format
msgid ""
"_: one\n"
"twenty five to %1"
msgstr "差二十五分%1"
-#: clock.cpp:710
+#: clock.cpp:727
#, no-c-format
msgid ""
"_: one\n"
"twenty to %1"
msgstr "差二十分%1"
-#: clock.cpp:711
+#: clock.cpp:728
#, no-c-format
msgid ""
"_: one\n"
"quarter to %1"
msgstr "差一刻%1"
-#: clock.cpp:712
+#: clock.cpp:729
#, no-c-format
msgid ""
"_: one\n"
"ten to %1"
msgstr "差十分%1"
-#: clock.cpp:713
+#: clock.cpp:730
#, no-c-format
msgid ""
"_: one\n"
"five to %1"
msgstr "差五分%1"
-#: clock.cpp:714
+#: clock.cpp:731
#, no-c-format
msgid ""
"_: one\n"
"%1 o'clock"
msgstr "%1整"
-#: clock.cpp:716
+#: clock.cpp:733
msgid "Night"
msgstr "午夜"
-#: clock.cpp:717
+#: clock.cpp:734
msgid "Early morning"
msgstr "凌晨"
-#: clock.cpp:717
+#: clock.cpp:734
msgid "Morning"
msgstr "早晨"
-#: clock.cpp:717
+#: clock.cpp:734
msgid "Almost noon"
msgstr "午前"
-#: clock.cpp:718
+#: clock.cpp:735
msgid "Noon"
msgstr "中午"
-#: clock.cpp:718
+#: clock.cpp:735
msgid "Afternoon"
msgstr "下午"
-#: clock.cpp:718
+#: clock.cpp:735
msgid "Evening"
msgstr "晚上"
-#: clock.cpp:719
+#: clock.cpp:736
msgid "Late evening"
msgstr "深夜"
-#: clock.cpp:821
+#: clock.cpp:838
msgid "Start of week"
msgstr "一周开始"
-#: clock.cpp:823
+#: clock.cpp:840
msgid "Middle of week"
msgstr "一周中间"
-#: clock.cpp:825
+#: clock.cpp:842
msgid "End of week"
msgstr "一周之末"
-#: clock.cpp:827
+#: clock.cpp:844
msgid "Weekend!"
msgstr "周末!"
-#: clock.cpp:1502
+#: clock.cpp:1541
msgid "Clock"
msgstr "时钟"
-#: clock.cpp:1528 clock.cpp:1731
+#: clock.cpp:1567 clock.cpp:1770
msgid "Local Timezone"
msgstr "本地时区"
-#: clock.cpp:1537
+#: clock.cpp:1576
msgid "&Configure Timezones..."
msgstr "配置时区(&C)..."
-#: clock.cpp:1541
+#: clock.cpp:1580
msgid "&Plain"
msgstr "简单(&P)"
-#: clock.cpp:1542
+#: clock.cpp:1581
msgid "&Digital"
msgstr "数字(&D)"
-#: clock.cpp:1543
+#: clock.cpp:1582
msgid "&Analog"
msgstr "模拟(&A)"
-#: clock.cpp:1544
+#: clock.cpp:1583
msgid "&Fuzzy"
msgstr "文字(&F)"
-#: clock.cpp:1547
+#: clock.cpp:1586
msgid "&Type"
msgstr "类型(&T)"
-#: clock.cpp:1548
+#: clock.cpp:1587
msgid "Show Time&zone"
msgstr "显示时区(&Z)"
-#: clock.cpp:1551
+#: clock.cpp:1590
msgid "&Adjust Date && Time..."
msgstr "调整日期和时间(&A)..."
-#: clock.cpp:1553
+#: clock.cpp:1592
msgid "Date && Time &Format..."
msgstr "日期和时间格式(&F)..."
-#: clock.cpp:1556
+#: clock.cpp:1595
msgid "C&opy to Clipboard"
msgstr "复制到剪贴板(&O)"
-#: clock.cpp:1560
+#: clock.cpp:1599
msgid "&Configure Clock..."
msgstr "配置时钟(&C)..."
-#: clock.cpp:1813
+#: clock.cpp:1852
#, c-format
msgid "Showing time for %1"
msgstr "显示 %1 的时间"
@@ -390,19 +391,19 @@ msgid "&Frame"
msgstr "窗口(&F)"
#. i18n: file analog.ui line 92
-#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:147
+#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:150
#, no-c-format
msgid "Time"
msgstr "时间"
#. i18n: file analog.ui line 136
-#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:156 rc.cpp:162
+#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:159 rc.cpp:165
#, no-c-format
msgid "Foreground color:"
msgstr "前景色:"
#. i18n: file analog.ui line 167
-#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:153 rc.cpp:165
+#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:156 rc.cpp:168
#, no-c-format
msgid "Background color:"
msgstr "背景色:"
@@ -456,7 +457,7 @@ msgid "LCD look"
msgstr "LCD 外观"
#. i18n: file fuzzy.ui line 124
-#: rc.cpp:93 rc.cpp:150 rc.cpp:168
+#: rc.cpp:93 rc.cpp:153 rc.cpp:171
#, no-c-format
msgid "Font:"
msgstr "字体:"
@@ -527,32 +528,38 @@ msgstr "文字时钟"
msgid "&Seconds"
msgstr "秒(&S)"
-#. i18n: file settings.ui line 326
-#: rc.cpp:159
+#. i18n: file settings.ui line 186
+#: rc.cpp:147
+#, fuzzy, no-c-format
+msgid "&Shadow"
+msgstr "阴影颜色:"
+
+#. i18n: file settings.ui line 334
+#: rc.cpp:162
#, no-c-format
msgid "Date"
msgstr "日期"
-#. i18n: file settings.ui line 438
-#: rc.cpp:171
+#. i18n: file settings.ui line 446
+#: rc.cpp:174
#, no-c-format
msgid "&Timezones"
msgstr "时区(&T)"
-#. i18n: file settings.ui line 447
-#: rc.cpp:174
+#. i18n: file settings.ui line 455
+#: rc.cpp:177
#, no-c-format
msgid "City"
msgstr "城市"
-#. i18n: file settings.ui line 458
-#: rc.cpp:177
+#. i18n: file settings.ui line 466
+#: rc.cpp:180
#, no-c-format
msgid "Comment"
msgstr "备注"
-#. i18n: file settings.ui line 474
-#: rc.cpp:180
+#. i18n: file settings.ui line 482
+#: rc.cpp:183
#, no-c-format
msgid ""
"A list of timezones known to your system. Press the middle mouse button on the "
@@ -560,91 +567,97 @@ msgid ""
msgstr "这是系统支持的城市列表。选择世界各地的城市,用鼠标中键点击任务条上的时钟,它能显示选定城市的时间。"
#. i18n: file clockapplet.kcfg line 10
-#: rc.cpp:183
+#: rc.cpp:186
#, no-c-format
msgid "Clock type"
msgstr "时钟类型:"
#. i18n: file clockapplet.kcfg line 22
-#: rc.cpp:186 rc.cpp:189 rc.cpp:210 rc.cpp:228 rc.cpp:255 rc.cpp:282
+#: rc.cpp:189 rc.cpp:192 rc.cpp:216 rc.cpp:234 rc.cpp:261 rc.cpp:288
#, no-c-format
msgid "Foreground color."
msgstr "前景色。"
#. i18n: file clockapplet.kcfg line 30
-#: rc.cpp:192 rc.cpp:207 rc.cpp:279
+#: rc.cpp:195 rc.cpp:213 rc.cpp:285
#, no-c-format
msgid "Font for the clock."
msgstr "时钟使用的字体。"
#. i18n: file clockapplet.kcfg line 40
-#: rc.cpp:195 rc.cpp:216 rc.cpp:243
+#: rc.cpp:198 rc.cpp:222 rc.cpp:249
#, no-c-format
msgid "Show seconds."
msgstr "显示秒。"
#. i18n: file clockapplet.kcfg line 44
-#: rc.cpp:198 rc.cpp:219 rc.cpp:246 rc.cpp:270
+#: rc.cpp:201 rc.cpp:225 rc.cpp:252 rc.cpp:276
#, no-c-format
msgid "Show date."
msgstr "显示日期。"
#. i18n: file clockapplet.kcfg line 48
-#: rc.cpp:201 rc.cpp:222 rc.cpp:249 rc.cpp:273
+#: rc.cpp:204 rc.cpp:228 rc.cpp:255 rc.cpp:279
#, no-c-format
msgid "Show day of week."
msgstr "显示周内日。"
#. i18n: file clockapplet.kcfg line 52
-#: rc.cpp:204 rc.cpp:225 rc.cpp:252 rc.cpp:276
+#: rc.cpp:207 rc.cpp:231 rc.cpp:258 rc.cpp:282
#, no-c-format
msgid "Show frame."
msgstr "显示窗口。"
-#. i18n: file clockapplet.kcfg line 69
-#: rc.cpp:213 rc.cpp:231 rc.cpp:258 rc.cpp:285
+#. i18n: file clockapplet.kcfg line 56
+#: rc.cpp:210
+#, no-c-format
+msgid "Use shadow."
+msgstr ""
+
+#. i18n: file clockapplet.kcfg line 73
+#: rc.cpp:219 rc.cpp:237 rc.cpp:264 rc.cpp:291
#, no-c-format
msgid "Background color."
msgstr "背景颜色。"
-#. i18n: file clockapplet.kcfg line 99
-#: rc.cpp:234 rc.cpp:261
+#. i18n: file clockapplet.kcfg line 103
+#: rc.cpp:240 rc.cpp:267
#, no-c-format
msgid "Shadow color."
msgstr "阴影颜色。"
-#. i18n: file clockapplet.kcfg line 103
-#: rc.cpp:237
+#. i18n: file clockapplet.kcfg line 107
+#: rc.cpp:243
#, no-c-format
msgid "Blink"
msgstr "闪烁"
-#. i18n: file clockapplet.kcfg line 107
-#: rc.cpp:240 rc.cpp:264
+#. i18n: file clockapplet.kcfg line 111
+#: rc.cpp:246 rc.cpp:270
#, no-c-format
msgid "LCD Style"
msgstr "LCD 风格"
-#. i18n: file clockapplet.kcfg line 145
-#: rc.cpp:267
+#. i18n: file clockapplet.kcfg line 149
+#: rc.cpp:273
#, no-c-format
msgid "Anti-Alias factor"
msgstr "边缘平滑的刻度"
-#. i18n: file clockapplet.kcfg line 178
-#: rc.cpp:288
+#. i18n: file clockapplet.kcfg line 182
+#: rc.cpp:294
#, no-c-format
msgid "Fuzzyness"
msgstr "模糊度"
-#. i18n: file clockapplet.kcfg line 184
-#: rc.cpp:291
+#. i18n: file clockapplet.kcfg line 188
+#: rc.cpp:297
#, no-c-format
msgid "Show window frame"
msgstr "显示窗口框架"
-#. i18n: file clockapplet.kcfg line 188
-#: rc.cpp:294
+#. i18n: file clockapplet.kcfg line 192
+#: rc.cpp:300
#, no-c-format
msgid "Default size of the calendar"
msgstr "日历的默认大小"
diff --git a/tde-i18n-zh_CN/messages/tdebase/display.po b/tde-i18n-zh_CN/messages/tdebase/display.po
index 9b9b135fb4d..466cdbb39a7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/display.po
+++ b/tde-i18n-zh_CN/messages/tdebase/display.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: display\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-05-03 13:30+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po b/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
index 05e8906fa7f..fdd7c819018 100644
--- a/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: dockbarextension\n"
-"POT-Creation-Date: 2005-11-06 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-07-04 22:59+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/drkonqi.po b/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
index 156ab44be64..65cb988df76 100644
--- a/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
+++ b/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: drkonqi\n"
-"POT-Creation-Date: 2008-01-23 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-17 11:40+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,10 +27,33 @@ msgid ""
"Your emails"
msgstr "lark@linux.net.cn"
-#: backtrace.cpp:83
+#: backtrace.cpp:97
msgid "Could not generate a backtrace as the debugger '%1' was not found."
msgstr "无法生成回溯跟踪,因为找不到调试器“%1”。"
+#: backtrace.cpp:146
+#, fuzzy
+msgid "Administrative access is required to generate a backtrace"
+msgstr "无法生成回溯跟踪。"
+
+#: bugdescription.cpp:59
+msgid "Crash Report"
+msgstr ""
+
+#: bugdescription.cpp:67 bugdescriptiondialog.cpp:60
+msgid "Bug Description"
+msgstr ""
+
+#: bugdescriptiondialog.cpp:83
+msgid "Contact Email: "
+msgstr ""
+
+#: bugdescriptiondialog.cpp:90
+msgid ""
+"Enter the text (in English if possible) that you wish to submit with this crash "
+"report.\n"
+msgstr ""
+
#: debugger.cpp:65
msgid "C&opy"
msgstr "复制(&O)"
@@ -47,24 +71,24 @@ msgstr "回溯跟踪已保存到 %1"
msgid "Cannot create a file in which to save the backtrace"
msgstr "无法创建用于保存回溯跟踪的文件"
-#: debugger.cpp:115
+#: debugger.cpp:115 toplevel.cpp:485
msgid "Select Filename"
msgstr "选择文件名"
-#: debugger.cpp:123
+#: debugger.cpp:123 toplevel.cpp:496
msgid ""
"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
msgstr "已经存在名为“%1”的文件。您确定想要覆盖吗?"
-#: debugger.cpp:125
+#: debugger.cpp:125 toplevel.cpp:498
msgid "Overwrite File?"
msgstr "覆盖文件吗?"
-#: debugger.cpp:126
+#: debugger.cpp:126 toplevel.cpp:499
msgid "&Overwrite"
msgstr "覆盖(&O)"
-#: debugger.cpp:138
+#: debugger.cpp:138 toplevel.cpp:510
msgid "Cannot open file %1 for writing"
msgstr "无法打开文件 %1 写入"
@@ -178,39 +202,43 @@ msgstr "禁用任意访问磁盘"
msgid "The TDE Crash Handler"
msgstr "TDE 崩溃处理程序"
-#: toplevel.cpp:59
+#: toplevel.cpp:63
msgid "&Bug report"
msgstr "错误报告(&B)"
-#: toplevel.cpp:60
+#: toplevel.cpp:64
msgid "&Debugger"
msgstr "调试器(&D)"
-#: toplevel.cpp:64
+#: toplevel.cpp:65
+msgid "&Report Crash"
+msgstr ""
+
+#: toplevel.cpp:69
msgid "&General"
msgstr "常规(&G)"
-#: toplevel.cpp:79
+#: toplevel.cpp:84
msgid "&Backtrace"
msgstr "回溯跟踪(&B)"
-#: toplevel.cpp:103
+#: toplevel.cpp:108
msgid "<p><b>Short description</b></p><p>%1</p>"
msgstr "<p><b>简短描述</b></p><p>%1</p>"
-#: toplevel.cpp:107
+#: toplevel.cpp:112
msgid "<p><b>What is this?</b></p><p>%1</p>"
msgstr "<p><b>这是什么?</b></p><p>%1</p>"
-#: toplevel.cpp:111
+#: toplevel.cpp:116
msgid "<p><b>What can I do?</b></p><p>%1</p>"
msgstr "<p><b>我能做什么?</b></p><p>%1</p>"
-#: toplevel.cpp:116
+#: toplevel.cpp:121
msgid "<p><b>Application crashed</b></p><p>The program %appname crashed.</p>"
msgstr "<p><b>程序已崩溃</b></p><p>程序 %appname 已经崩溃了。</p>"
-#: toplevel.cpp:135
+#: toplevel.cpp:140
msgid ""
"<p>Do you want to generate a backtrace? This will help the developers to figure "
"out what went wrong.</p>\n"
@@ -223,22 +251,95 @@ msgstr ""
"<p>不好的是在慢速的机器上,这要花费一些时间。</p>"
"<p><b>注意:回溯跟踪不能代替对错误的正确描述和如何重现错误的信息。如果没有正确的描述,将无法修补错误。</b></p>"
-#: toplevel.cpp:147
+#: toplevel.cpp:152
msgid "Include Backtrace"
msgstr "包括回溯跟踪"
-#: toplevel.cpp:147
+#: toplevel.cpp:152
msgid "Generate"
msgstr "生成"
-#: toplevel.cpp:147
+#: toplevel.cpp:152
msgid "Do Not Generate"
msgstr "不生成"
-#: toplevel.cpp:215
+#: toplevel.cpp:229 toplevel.cpp:241
msgid "It was not possible to generate a backtrace."
msgstr "无法生成回溯跟踪。"
-#: toplevel.cpp:216
+#: toplevel.cpp:230 toplevel.cpp:241
msgid "Backtrace Not Possible"
msgstr "不可能回溯跟踪"
+
+#: toplevel.cpp:255
+msgid ""
+"<p>Do you want to include a description of what you were doing when this "
+"application crashed? This would help the developers to figure out what went "
+"wrong.</p>\n"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Include Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Add Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Just Report the Crash"
+msgstr ""
+
+#: toplevel.cpp:353
+msgid ""
+"<p>The crash report is ready. Do you want to send it now?</p>\n"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Ready to Send"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "View Report"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Send Report"
+msgstr ""
+
+#: toplevel.cpp:435
+msgid ""
+"<p>Your crash report has been uploaded!</p></p>You may reference it if desired "
+"by its unique ID:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:436
+msgid "Report uploaded"
+msgstr ""
+
+#: toplevel.cpp:448
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+"<p>The server responded:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Upload failure"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Save Report"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Retry Upload"
+msgstr ""
+
+#: toplevel.cpp:465
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po b/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
index e7226f06491..3ade7dd9035 100644
--- a/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
@@ -1,10 +1,11 @@
msgid ""
msgstr ""
"Project-Id-Version: extensionproxy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-23 18:26+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/filetypes.po b/tde-i18n-zh_CN/messages/tdebase/filetypes.po
index bf98c9268bc..49624a9f4ed 100644
--- a/tde-i18n-zh_CN/messages/tdebase/filetypes.po
+++ b/tde-i18n-zh_CN/messages/tdebase/filetypes.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: filetype\n"
-"POT-Creation-Date: 2007-02-02 02:29+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-16 11:42+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,7 +213,8 @@ msgid ""
msgstr "TDE 文件类型编辑器 - 用来编辑单个文件类型的简化版本"
#: keditfiletype.cpp:117
-msgid "(c) 2000, TDE developers"
+#, fuzzy
+msgid "(c) 2000, KDE developers"
msgstr "(c) 2000,TDE 开发者"
#: keditfiletype.cpp:151
diff --git a/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po b/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
index 01d789ab460..b91bfb7f3bb 100644
--- a/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: htmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-02-24 00:49+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/joystick.po b/tde-i18n-zh_CN/messages/tdebase/joystick.po
index db408f4baf9..20d8099679d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/joystick.po
+++ b/tde-i18n-zh_CN/messages/tdebase/joystick.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2006-03-02 03:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-08-01 22:45+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kaccess.po b/tde-i18n-zh_CN/messages/tdebase/kaccess.po
index 6d08f5c2735..ebb387de3e6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kaccess.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kaccess.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kaccess\n"
-"POT-Creation-Date: 2006-09-16 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:06+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -299,8 +300,8 @@ msgstr "应用程序请求更改这些设置。"
#: kaccess.cpp:751
msgid ""
"These AccessX settings are needed for some users with motion impairments and "
-"can be configured in the Trinity Control Center. You can also turn them on and off "
-"with standardized keyboard gestures.\n"
+"can be configured in the Trinity Control Center. You can also turn them on and "
+"off with standardized keyboard gestures.\n"
"\n"
"If you do not need them, you can select \"Deactivate all AccessX features and "
"gestures\"."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kappfinder.po b/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
index f1e78ce82e5..34a815cdec8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-21 22:30+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
index 95277a8cc05..190313c0544 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2006-08-13 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-14 04:12+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,8 @@ msgid "About Kasbar"
msgstr "关于 Kasbar"
#: kasaboutdlg.cpp:156
-msgid "<qt><body><h2>Kasbar Version: %1</h2><b>TDE Version:</b> %2</body></qt>"
+#, fuzzy
+msgid "<qt><body><h2>Kasbar Version: %1</h2><b>KDE Version:</b> %2</body></qt>"
msgstr "<qt><body><h2>Kasbar 版本:%1</h2><b>TDE 版本:</b> %2</body><qt>"
#: kasaboutdlg.cpp:164
diff --git a/tde-i18n-zh_CN/messages/tdebase/kate.po b/tde-i18n-zh_CN/messages/tdebase/kate.po
index d7db872616b..69d1b9b9d8a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kate.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kate.po
@@ -10,190 +10,197 @@
msgid ""
msgstr ""
"Project-Id-Version: kate\n"
-"POT-Creation-Date: 2008-08-14 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-09 07:46+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: app/kateexternaltools.cpp:276
-msgid "Failed to expand the command '%1'."
-msgstr "展开命令“%1”失败。"
-
-#: app/kateexternaltools.cpp:277
-msgid "Kate External Tools"
-msgstr "Kate 外部工具"
-
-#: app/kateexternaltools.cpp:427
-msgid "Edit External Tool"
-msgstr "编辑外部工具"
-
-#: app/kateexternaltools.cpp:441
-msgid "&Label:"
-msgstr "标签(&L):"
-
-#: app/kateexternaltools.cpp:446
-msgid "The name will be displayed in the 'Tools->External' menu"
-msgstr "将显示于“工具->外部”菜单中的名称"
+#: _translatorinfo.cpp:1 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Simplified Chinese Translation Team"
-#: app/kateexternaltools.cpp:456
-msgid "S&cript:"
-msgstr "脚本(&C):"
+#: _translatorinfo.cpp:3 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
-#: app/kateexternaltools.cpp:461
+#: tips.txt:3
msgid ""
-"<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
-"for execution. The following macros will be expanded:</p>"
-"<ul>"
-"<li><code>%URL</code> - the URL of the current document."
-"<li><code>%URLs</code> - a list of the URLs of all open documents."
-"<li><code>%directory</code> - the URL of the directory containing the current "
-"document."
-"<li><code>%filename</code> - the filename of the current document."
-"<li><code>%line</code> - the current line of the text cursor in the current "
-"view."
-"<li><code>%column</code> - the column of the text cursor in the current view."
-"<li><code>%selection</code> - the selected text in the current view."
-"<li><code>%text</code> - the text of the current document.</ul>"
+"<p>Kate comes with a nice set of plugins, providing simple\n"
+"and advanced features of all sorts.</p>\n"
+"<p>You can enable/disable plugins to suit your needs in the configuration "
+"dialog,\n"
+"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
msgstr ""
-"<p>调用工具要执行的脚本。脚本会传递给 /bin/sh 执行。下列宏将会被展开:</p>"
-"<ul>"
-"<li><code>%URL</code> - 当前文档的 URL。"
-"<li><code>%URLs</code> - 打开的全部文档的 URL。"
-"<li><code>%directory</code> - 包含当前文档的目录的 URL。"
-"<li><code>%filename</code> - 当前文档的文件名。"
-"<li><code>%line</code> - 当前视图中光标所在文本行号。"
-"<li><code>%column</code> - 当前视图中光标所在文本列数。"
-"<li><code>%selection</code> - 当前视图中所选的文本。"
-"<li><code>%text</code> - 当前文档的文本。</ul>"
-
-#: app/kateexternaltools.cpp:479
-msgid "&Executable:"
-msgstr "可执行(&E):"
+"<p>Kate 附带了一组不错的插件,提供了各种简单的和高级的功能。</p>"
+"<p>您可以在配置对话框中启用/禁用插件来满足您的需要,选择 <strong>设置 -&gt;configure</strong> 来启动配置对话框。</p>"
+"\n"
-#: app/kateexternaltools.cpp:484
+#: tips.txt:11
msgid ""
-"The executable used by the command. This is used to check if a tool should be "
-"displayed; if not set, the first word of <em>command</em> will be used."
-msgstr "此命令使用的可执行文件。此选项将用来检查是否要显示此工具;如果未设置的话,将会使用 <em>command</em> 的第一个单词。"
-
-#: app/kateexternaltools.cpp:490
-msgid "&Mime types:"
-msgstr "MIME 类型(&M):"
+"<p>You can swap the characters on each side of the cursor just by pressing\n"
+"<strong>Ctrl+T</strong></p>\n"
+msgstr ""
+"<p>您可以交换光标两侧的字符,方法是按 <strong>Ctrl+T</strong></p>\n"
-#: app/kateexternaltools.cpp:495
+#: tips.txt:17
msgid ""
-"A semicolon-separated list of mime types for which this tool should be "
-"available; if this is left empty, the tool is always available. To choose from "
-"known mimetypes, press the button on the right."
-msgstr "此工具适用于的 MIME 类型列表,用分号分隔;如果为空的话,此工具将总是有效。要从已知的 MIME 类型中选择,请按右侧的按钮。"
-
-#: app/kateexternaltools.cpp:504
-msgid "Click for a dialog that can help you creating a list of mimetypes."
-msgstr "单击可出现一个帮助您创建 MIME 类型列表的对话框。"
-
-#: app/kateexternaltools.cpp:508
-msgid "&Save:"
-msgstr "保存(&S):"
-
-#: app/kateexternaltools.cpp:512
-msgid "None"
-msgstr "无"
-
-#: app/kateexternaltools.cpp:512
-msgid "Current Document"
-msgstr "当前文档"
-
-#: app/kateexternaltools.cpp:512
-msgid "All Documents"
-msgstr "全部文档"
+"<p>You can export the current document as a HTML file, including\n"
+"syntax highlighting.</p>\n"
+"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
+msgstr ""
+"<p>您可以把当前文档导出为 HTML 文件,包括语法加亮显示。</p>"
+"<p>只需选择 <strong>文件 -&gt; 导出 -&gt; HTML...</strong>即可</p>\n"
-#: app/kateexternaltools.cpp:516
+#: tips.txt:24
msgid ""
-"You can elect to save the current or all [modified] documents prior to running "
-"the command. This is helpful if you want to pass URLs to an application like, "
-"for example, an FTP client."
-msgstr "您可以选择在运行命令前先保存当前或[已修改]的全部文档。如果您想要将 URL 传递给像 FTP 客户端这样的应用程序的话,此功能将非常有用。"
-
-#: app/kateexternaltools.cpp:523
-msgid "&Command line name:"
-msgstr "命令行名称(&C):"
+"<p>You can split the Kate editor as many times as you like and\n"
+"in either direction. Each frame has its own status bar and\n"
+"can display any open document.</p>\n"
+"<p>Just choose "
+"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
+msgstr ""
+"<p>您可以按任意方向多次分割 Kate 编辑器。每个框架中都有它自己的状态栏,并能够显示任何打开的文件。</p>"
+"<p>只需选择"
+"<br><strong>查看 -&gt; [ 水平 | 垂直 ]分割</strong> 即可。</p>\n"
-#: app/kateexternaltools.cpp:528
+#: tips.txt:32
msgid ""
-"If you specify a name here, you can invoke the command from the view command "
-"lines with exttool-the_name_you_specified_here. Please do not use spaces or "
-"tabs in the name."
-msgstr "如果您在此指定名称,您就可以从查看命令行中使用该名称调用该命令。请不要在名称中使用空格或跳格键。"
-
-#: app/kateexternaltools.cpp:539
-msgid "You must specify at least a name and a command"
-msgstr "您必须至少指定一个名称和命令"
-
-#: app/kateexternaltools.cpp:548
-msgid "Select the MimeTypes for which to enable this tool."
-msgstr "选择此工具适用的 MIME 类型。"
-
-#: app/kateexternaltools.cpp:550
-msgid "Select Mime Types"
-msgstr "选择 MIME 类型"
-
-#: app/kateexternaltools.cpp:568
-msgid "&New..."
-msgstr "新建(&N)..."
-
-#: app/kateexternaltools.cpp:576
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
+"to any side that you want them in Kate, or stack them, or even tear them off "
+"the\n"
+"main window.</p>\n"
+msgstr ""
+"<p>您可以把工具视图(<em>文件列表</em>和<em>文件选择器</em>)拖放到 Kate 的任何一边上,或叠放它们,甚至从主窗口中分裂出来。</p>"
+"\n"
-#: app/kateexternaltools.cpp:580
-msgid "Insert &Separator"
-msgstr "插入分隔符(&S)"
+#: tips.txt:39
+msgid ""
+"<p>Kate has a built-in terminal emulator, just click on <strong>"
+"\"Terminal\"</strong> at\n"
+"the bottom to show or hide it as you desire.</p>\n"
+msgstr ""
+"<p>Kate 有一个内建的终端仿真器,只需点击下面的<strong>“终端”</strong>来随意显示或隐藏它。</p>\n"
-#: app/kateexternaltools.cpp:602
+#: tips.txt:45
msgid ""
-"This list shows all the configured tools, represented by their menu text."
-msgstr "此列表显示了配置的全部工具,各选项用菜单文字代表。"
+"<p>Kate can highlight the current line with a\n"
+"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
+"width=\"100%\">"
+"<tr>"
+"<td>different\n"
+"background color.<strong>|</strong></td></tr></table></p>\n"
+"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
+"dialog.</p>\n"
+msgstr ""
+"<p>Kate 可以使用<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" "
+"cellpadding=\"0\" width=\"100%\">"
+"<tr>"
+"<td>不同的背景颜色<strong>|</strong></td></tr></table>来突出显示当前行。</p>"
+"<p>您可以在配置对话框中的<em>颜色</em>页中设置颜色。</p>\n"
-#: app/kateviewspace.cpp:320 app/kateviewspace.cpp:359
-msgid " INS "
-msgstr " 插入 "
+#: tips.txt:54
+msgid ""
+"<p>You can open the currently edited file in any other application from within\n"
+"Kate.</p>\n"
+"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
+"configured\n"
+"for the document type. There is also an option <strong>Other...</strong> to\n"
+"choose any application on your system.</p>\n"
+msgstr ""
+"<p>您可以在 Kate 内用任何其它程序打开当前正在被编辑的文件。</p>"
+"<p>选择<strong>文件 -&gt; 打开方式</strong> 来选择配置给该文档类型的程序。其中还有一个选项<strong>"
+"其它...</strong>,您可以用它来选择系统上的任何程序。</p>\n"
-#: app/kateviewspace.cpp:325 app/kateviewspace.cpp:363
-msgid " NORM "
-msgstr " 普通 "
+#: tips.txt:64
+msgid ""
+"<p>You can configure the editor to always display the line numbers and/or\n"
+"bookmark panes when started from the <strong>View Defaults</strong> "
+"page of the\n"
+"configuration dialog.</p>\n"
+msgstr ""
+"<p>您可以在配置对话框中的<strong>视图默认值</strong>页中配置,让编辑器启动时总是显示行号和/或书签栏。</p>\n"
-#: app/kateviewspace.cpp:351
-msgid " Line: %1 Col: %2 "
-msgstr " 行:%1 列:%2 "
+#: tips.txt:71
+msgid ""
+"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
+"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
+"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
+"tab (You have to be online, of course...).</p>\n"
+msgstr ""
+"<p>您可以在配置对话框中的<strong>加亮显示</strong>页上下载新的或更新的<em>语法加亮定义</em></p>"
+"<p>只需点击<em>加亮显示模式</em>标签上的<em>下载...</em>按钮即可(当然,您必须得在线才行...)。</p>\n"
-#: app/kateviewspace.cpp:355
-msgid " R/O "
-msgstr " 只读 "
+#: tips.txt:79
+msgid ""
+"<p>You can cycle through all open documents by pressing <strong>"
+"Alt+Left</strong>\n"
+"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
+"displayed\n"
+"in the active frame.</p>\n"
+msgstr ""
+"<p>您可以通过按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> "
+"来循环浏览所有打开的文档。下一/前一文档将会被立即显示在活跃的框架中。</p>\n"
-#: app/kateviewspace.cpp:357
-msgid " OVR "
-msgstr " 改写 "
+#: tips.txt:86
+msgid ""
+"<p>You can do cool sed-like regular expression replacements using <em>"
+"Command Line</em>.</p>\n"
+"<p>For example, press <strong>F7</strong> and enter <code>"
+"s /oldtext/newtext/g</code>\n"
+"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
+"line.</p>\n"
+msgstr ""
+"<p>您可以使用 <em>编辑命令</em> 来执行类似 sed 的正则表达式替换。</p>"
+"<p>例如,按 <strong>Ctrl+M</strong> 并输入<code>s/oldtext/newtext/g</code> "
+"会把当前行中的所有“oldtext”替换为“newtext”</p>\n"
-#: app/kateviewspace.cpp:363
-msgid " BLK "
-msgstr " 块 "
+#: tips.txt:94
+msgid ""
+"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
+"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
+msgstr ""
+"<p>您只需按 <strong>F3</strong> 来重复刚才的搜索,或者按 <strong>Shift+F3</strong> 来反向搜索。</p>\n"
-#: app/kateconsole.cpp:129
+#: tips.txt:100
msgid ""
-"Do you really want to pipe the text to the console? This will execute any "
-"contained commands with your user rights."
-msgstr "您真的想要将文本管道到控制台吗?这将使用您的用户权限执行其中包含的任何命令。"
+"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
+"</p>\n"
+"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
+"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
+"current folder.</p>\n"
+"<p>The File Selector will even remember your filters for you.</strong></p>\n"
+msgstr ""
+"<p>您可以过滤显示在 <em>文件选择器</em> 工具视图中的文件。</p>"
+"<p>只需在底部的过滤器框中输入您的过滤器即可。例如:输入 <code>*.html *.php</code>"
+",如果您只想看到当前文件夹中的 HTML 和 PHP 文件。</p>"
+"<p>文件选择器甚至会记住您使用过的过滤器。</strong></p>\n"
-#: app/kateconsole.cpp:130
-msgid "Pipe to Console?"
-msgstr "管道到控制台吗?"
+#: tips.txt:110
+msgid ""
+"<p>You can have two views - or even more - of the same document in Kate. "
+"Editing\n"
+"in either will be reflected in both.</p>\n"
+"<p>So if you find yourself scrolling up and down to look at text at the other\n"
+"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
+"horizontally.</p>\n"
+msgstr ""
+"<p>在 Kate 中,同一文档您可以有两个视图 - 甚至更多。在任何一个视图中编辑该文档都会反映在所有视图中。</p>"
+"<p>因此,如果您需要前后寻找文档另一端的文本时,只需按 <strong>Ctrl+Shift+T</strong> 来水平分割它即可。</p>\n"
-#: app/kateconsole.cpp:131
-msgid "Pipe to Console"
-msgstr "管道到控制台"
+#: tips.txt:119
+msgid ""
+"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
+"next/previous frame.</p>\n"
+msgstr ""
+"<p>按 <strong>F8</strong> 或 <strong>Shift+F8</strong> 来切换到下一/前一框架。</p>\n"
#: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152
msgid "Documents"
@@ -257,8 +264,8 @@ msgstr "关闭该窗口"
msgid "Create a new Kate view (a new window with the same document list)."
msgstr "创建一个新的 Kate 视图(一个有同样文档列表的新窗口)。"
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:269
-#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:540
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:299
+#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:539
msgid "External Tools"
msgstr "外部工具"
@@ -331,44 +338,44 @@ msgstr "试图关闭 Kate 时打开了新文件,关闭被中止。"
msgid "Closing Aborted"
msgstr "关闭被中止"
-#: app/katemainwindow.cpp:489
+#: app/katemainwindow.cpp:488
msgid ""
"_: 'document name [*]', [*] means modified\n"
"%1 [*]"
msgstr "%1 [*]"
-#: app/katemainwindow.cpp:611
+#: app/katemainwindow.cpp:610
msgid "&Other..."
msgstr "其它(&O)..."
-#: app/katemainwindow.cpp:621
+#: app/katemainwindow.cpp:620
msgid "Other..."
msgstr "其它..."
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
msgid "Application '%1' not found!"
msgstr "应用程序“%1”未找到!"
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
msgid "Application Not Found!"
msgstr "应用程序未找到!"
-#: app/katemainwindow.cpp:666
+#: app/katemainwindow.cpp:665
msgid ""
"<p>The current document has not been saved, and cannot be attached to an email "
"message."
"<p>Do you want to save it and proceed?"
msgstr "<p>当前文档还没有被保存,无法被附加到电子邮件消息。<p>您想保存它并继续吗?"
-#: app/katemainwindow.cpp:669
+#: app/katemainwindow.cpp:668
msgid "Cannot Send Unsaved File"
msgstr "无法发送未保存文件"
-#: app/katemainwindow.cpp:677 app/katemainwindow.cpp:698
+#: app/katemainwindow.cpp:676 app/katemainwindow.cpp:697
msgid "The file could not be saved. Please check if you have write permission."
msgstr "该文件无法被保存。请检查您是否拥有写权限。"
-#: app/katemainwindow.cpp:688
+#: app/katemainwindow.cpp:687
msgid ""
"<p>The current file:"
"<br><strong>%1</strong>"
@@ -376,304 +383,178 @@ msgid ""
"<p>Do you want to save it before sending it?"
msgstr "<p>当前文件:<br><strong>%1</strong><br>已被修改。修改将不会体现在附件中。<p>您想在发送前保存它吗?"
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
msgid "Save Before Sending?"
msgstr "发送前保存?"
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
msgid "Do Not Save"
msgstr "不保存"
-#: app/katemailfilesdialog.cpp:47
-msgid "Email Files"
-msgstr "邮寄文件"
-
-#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
-msgid "&Show All Documents >>"
-msgstr "显示所有文档(&S) >>"
-
-#: app/katemailfilesdialog.cpp:52
-msgid "&Mail..."
-msgstr "邮寄(&M)..."
-
-#: app/katemailfilesdialog.cpp:57
-msgid ""
-"<p>Press <strong>Mail...</strong> to email the current document."
-"<p>To select more documents to send, press <strong>Show All "
-"Documents&nbsp;&gt;&gt;</strong>."
-msgstr ""
-"<p>按 <strong>邮寄...</strong> 来把当前文档作为电子邮件发送。 "
-"<p>要选择更多文件进行,请按 <strong>显示所有文档&nbsp;&gt;&gt;</strong>。"
-
#: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61
msgid "Name"
msgstr "名称"
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
-#: app/katemailfilesdialog.cpp:62
-msgid "URL"
-msgstr "URL"
-
-#: app/katemailfilesdialog.cpp:104
-msgid "&Hide Document List <<"
-msgstr "隐藏文档列表(&H) <<"
-
-#: app/katemailfilesdialog.cpp:105
-msgid "Press <strong>Mail...</strong> to send selected documents"
-msgstr "按 <strong>邮寄...</strong> 来发送选定的文档"
-
-#: app/katemwmodonhddialog.cpp:61
-msgid "Documents Modified on Disk"
-msgstr "文档已在磁盘上修改"
-
-#: app/katemwmodonhddialog.cpp:63
-msgid "&Ignore"
-msgstr "忽略(&I)"
-
-#: app/katemwmodonhddialog.cpp:64
-msgid "&Overwrite"
-msgstr "覆盖(&O)"
-
-#: app/katemwmodonhddialog.cpp:68
-msgid ""
-"Removes the modified flag from the selected documents and closes the dialog if "
-"there are no more unhandled documents."
-msgstr "从选中文档中删除修改标记,如果没有其它未处理的文档的话,并关闭对话框。"
-
-#: app/katemwmodonhddialog.cpp:71
-msgid ""
-"Overwrite selected documents, discarding the disk changes and closes the dialog "
-"if there are no more unhandled documents."
-msgstr "覆盖选中的文档,丢弃磁盘上的更改,如果没有其它未处理的文档的话,关闭对话框。"
-
-#: app/katemwmodonhddialog.cpp:74
-msgid ""
-"Reloads the selected documents from disk and closes the dialog if there are no "
-"more unhandled documents."
-msgstr "从磁盘中重新装入选中文档,如果没有其它未处理的文档的话,关闭对话框。"
+#: app/kateconfigplugindialogpage.cpp:82
+msgid "Comment"
+msgstr "注释"
-#: app/katemwmodonhddialog.cpp:87
+#: app/kateconfigplugindialogpage.cpp:83
msgid ""
-"<qt>The documents listed below has changed on disk."
-"<p>Select one or more at the time and press an action button until the list is "
-"empty.</qt>"
-msgstr "<qt>下面列出的文档在磁盘上已经发生了更改。<p>一次选择一个或多个文档,然后按下操作按钮,直到此列表变空。</qt>"
-
-#: app/katemwmodonhddialog.cpp:93
-msgid "Filename"
-msgstr "文件名"
-
-#: app/katemwmodonhddialog.cpp:94
-msgid "Status on Disk"
-msgstr "磁盘上的状态"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Modified"
-msgstr "已修改"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Created"
-msgstr "已创建"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Deleted"
-msgstr "已删除"
+"Here you can see all available Kate plugins. Those with a check mark are "
+"loaded, and will be loaded again the next time Kate is started."
+msgstr "此处您可以看到所有可用的 Kate 插件。那些带有选择标记的插件已被载入,并且在 Kate 下次启动时还会被载入。"
-#: app/katemwmodonhddialog.cpp:108
-msgid "&View Difference"
-msgstr "查看差异(&V)"
+#: app/katemain.cpp:41
+msgid "Start Kate with a given session"
+msgstr "以给定会话启动 Kate"
-#: app/katemwmodonhddialog.cpp:111
-msgid ""
-"Calculates the difference between the the editor contents and the disk file for "
-"the selected document, and shows the difference with the default application. "
-"Requires diff(1)."
-msgstr "计算选中文档的编辑器内容和磁盘文件之间的差异,然后用默认应用程序显示差异。需要 diff(1)。"
+#: app/katemain.cpp:43
+msgid "Use a already running kate instance (if possible)"
+msgstr "使用已经运行的 Kate 实例(如果有的话)"
-#: app/katemwmodonhddialog.cpp:163
-msgid ""
-"Could not save the document \n"
-"'%1'"
+#: app/katemain.cpp:45
+msgid "Force single document mode if the MDI setting is enabled."
msgstr ""
-"无法保存文档\n"
-"“%1”"
-
-#: app/katemwmodonhddialog.cpp:268
-msgid ""
-"The diff command failed. Please make sure that diff(1) is installed and in your "
-"PATH."
-msgstr "diff 命令失败。请确定 diff(1) 已经安装并且在您的路径中。"
-
-#: app/katemwmodonhddialog.cpp:270
-msgid "Error Creating Diff"
-msgstr "创建 Diff 失败"
-
-#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
-#: app/kateconfigdialog.cpp:174 app/kateconfigdialog.cpp:243
-#: app/kateconfigdialog.cpp:252 app/kateconfigdialog.cpp:260
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:317
-msgid "Application"
-msgstr "应用程序"
-
-#: app/kateconfigdialog.cpp:97
-msgid "General"
-msgstr "常规"
-#: app/kateconfigdialog.cpp:98
-msgid "General Options"
-msgstr "常规选项"
-
-#: app/kateconfigdialog.cpp:105
-msgid "&Appearance"
-msgstr "外观(&A)"
+#: app/katemain.cpp:47
+msgid "Only try to reuse kate instance with this pid"
+msgstr "只试着重用此 pid 的 Kate 实例"
-#: app/kateconfigdialog.cpp:110
-msgid "&Show full path in title"
-msgstr "在标题中显示完整路径(&S)"
+#: app/katemain.cpp:49 app/kwritemain.cpp:532
+msgid "Set encoding for the file to open"
+msgstr "设定打开文件所用的编码"
-#: app/kateconfigdialog.cpp:112
-msgid ""
-"If this option is checked, the full document path will be shown in the window "
-"caption."
-msgstr "如果该选项被选,在窗口标题处将会显示完整的文档路径。"
+#: app/katemain.cpp:51 app/kwritemain.cpp:533
+msgid "Navigate to this line"
+msgstr "转到这一行"
-#: app/kateconfigdialog.cpp:117
-msgid "&Behavior"
-msgstr "行为(&B)"
+#: app/katemain.cpp:53 app/kwritemain.cpp:534
+msgid "Navigate to this column"
+msgstr "转到这一列"
-#: app/kateconfigdialog.cpp:122
-msgid "Sync &terminal emulator with active document"
-msgstr "使终端仿真器与当前文档同步(&T)"
+#: app/katemain.cpp:55 app/kwritemain.cpp:531
+msgid "Read the contents of stdin"
+msgstr "读取标准输入设备上的内容"
-#: app/kateconfigdialog.cpp:125
-msgid ""
-"If this is checked, the built in Konsole will <code>cd</code> "
-"to the directory of the active document when started and whenever the active "
-"document changes, if the document is a local file."
-msgstr ""
-"如果选中此选项,对于本地文件,内建的 Konsole 将会在启动以及活跃文档改变时使用 <code>cd</code> 命令转到活跃文档所在的目录。"
+#: app/katemain.cpp:56 app/kwritemain.cpp:535
+msgid "Document to open"
+msgstr "要打开的文档"
-#: app/kateconfigdialog.cpp:132
-msgid "Wa&rn about files modified by foreign processes"
-msgstr "当文件被外部进程修改时给出警告(&R)"
+#: app/katemain.cpp:67
+msgid "Kate"
+msgstr "Kate"
-#: app/kateconfigdialog.cpp:135
-msgid ""
-"If enabled, when Kate receives focus you will be asked what to do with files "
-"that have been modified on the hard disk. If not enabled, you will be asked "
-"what to do with a file that has been modified on the hard disk only when that "
-"file gains focus inside Kate."
-msgstr ""
-"启用时,Kate 会在获得焦点后询问您如何处理硬盘上已经被修改的文件。如果未启用,直到在硬盘上已被修改的文件在 Kate 中获得焦点的时候,您才会被询问。"
+#: app/katemain.cpp:68
+msgid "Kate - Advanced Text Editor"
+msgstr "Kate - 高级文本编辑器"
-#: app/kateconfigdialog.cpp:143
-msgid "Meta-Information"
-msgstr "元信息"
+#: app/katemain.cpp:69 app/kwritemain.cpp:556
+msgid "(c) 2000-2005 The Kate Authors"
+msgstr "(c) 2000-2005 Kate 作者"
-#: app/kateconfigdialog.cpp:148
-msgid "Keep &meta-information past sessions"
-msgstr "在会话中保留元信息(&M)"
+#: app/katemain.cpp:71 app/kwritemain.cpp:558
+msgid "Maintainer"
+msgstr "维护者"
-#: app/kateconfigdialog.cpp:151
-msgid ""
-"Check this if you want document configuration like for example bookmarks to be "
-"saved past editor sessions. The configuration will be restored if the document "
-"has not changed when reopened."
-msgstr "如果您想要在编辑器的不同会话中保存像书签这样的文档配置,请选中此项。如果重新打开文档的时候文档没有更改,则会恢复配置文件。"
+#: app/katemain.cpp:72 app/katemain.cpp:73 app/katemain.cpp:74
+#: app/katemain.cpp:79 app/kwritemain.cpp:559 app/kwritemain.cpp:560
+#: app/kwritemain.cpp:561 app/kwritemain.cpp:566
+msgid "Core Developer"
+msgstr "核心开发"
-#: app/kateconfigdialog.cpp:159
-msgid "&Delete unused meta-information after:"
-msgstr "删除无用的元信息,等(&D):"
+#: app/katemain.cpp:75 app/kwritemain.cpp:562
+msgid "The cool buffersystem"
+msgstr "极好的缓冲系统"
-#: app/kateconfigdialog.cpp:161
-msgid "(never)"
-msgstr "(从不)"
+#: app/katemain.cpp:76 app/kwritemain.cpp:563
+msgid "The Editing Commands"
+msgstr "编辑命令"
-#: app/kateconfigdialog.cpp:162
-msgid " day(s)"
-msgstr " 天"
+#: app/katemain.cpp:77 app/kwritemain.cpp:564
+msgid "Testing, ..."
+msgstr "测试、..."
-#: app/kateconfigdialog.cpp:174
-msgid "Sessions"
-msgstr "会话"
+#: app/katemain.cpp:78 app/kwritemain.cpp:565
+msgid "Former Core Developer"
+msgstr "先前核心开发者"
-#: app/kateconfigdialog.cpp:175
-msgid "Session Management"
-msgstr "会话管理"
+#: app/katemain.cpp:80 app/kwritemain.cpp:567
+msgid "KWrite Author"
+msgstr "KWrite 作者"
-#: app/kateconfigdialog.cpp:181
-msgid "Elements of Sessions"
-msgstr "会话元素"
+#: app/katemain.cpp:81 app/kwritemain.cpp:568
+msgid "KWrite port to KParts"
+msgstr "KWrite 移植到 KParts"
-#: app/kateconfigdialog.cpp:186
-msgid "Include &window configuration"
-msgstr "包含窗口配置(&W)"
+#: app/katemain.cpp:84 app/kwritemain.cpp:571
+msgid "KWrite Undo History, Kspell integration"
+msgstr "KWrite 撤销历史,Kspell 集成"
-#: app/kateconfigdialog.cpp:190
-msgid ""
-"Check this if you want all your views and frames restored each time you open "
-"Kate"
-msgstr "如果您希望在每次打开 Kate 时都恢复所有视图和框架,启用此选项。"
+#: app/katemain.cpp:85 app/kwritemain.cpp:572
+msgid "KWrite XML Syntax highlighting support"
+msgstr "KWrite XML 语法加亮支持"
-#: app/kateconfigdialog.cpp:195
-msgid "Behavior on Application Startup"
-msgstr "应用启动时的行为"
+#: app/katemain.cpp:86 app/kwritemain.cpp:573
+msgid "Patches and more"
+msgstr "补丁及其它"
-#: app/kateconfigdialog.cpp:199
-msgid "&Start new session"
-msgstr "启动新会话(&S)"
+#: app/katemain.cpp:87
+msgid "Developer & Highlight wizard"
+msgstr "开发者和突出显示向导"
-#: app/kateconfigdialog.cpp:200
-msgid "&Load last-used session"
-msgstr "装入上次使用的会话(&L)"
+#: app/katemain.cpp:89 app/kwritemain.cpp:575
+msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
+msgstr "RPM Spec 文件、Perl、Diff 和其它类型的语法加亮"
-#: app/kateconfigdialog.cpp:201
-msgid "&Manually choose a session"
-msgstr "手动选择会话(&M)"
+#: app/katemain.cpp:90 app/kwritemain.cpp:576
+msgid "Highlighting for VHDL"
+msgstr "VHDL 语法加亮"
-#: app/kateconfigdialog.cpp:216
-msgid "Behavior on Application Exit or Session Switch"
-msgstr "应用程序退出或会话切换时的行为"
+#: app/katemain.cpp:91 app/kwritemain.cpp:577
+msgid "Highlighting for SQL"
+msgstr "SQL 语法加亮"
-#: app/kateconfigdialog.cpp:220
-msgid "&Do not save session"
-msgstr "不保存会话(&D)"
+#: app/katemain.cpp:92 app/kwritemain.cpp:578
+msgid "Highlighting for Ferite"
+msgstr "Ferite 语法加亮"
-#: app/kateconfigdialog.cpp:221
-msgid "&Save session"
-msgstr "保存会话(&S)"
+#: app/katemain.cpp:93 app/kwritemain.cpp:579
+msgid "Highlighting for ILERPG"
+msgstr "ILERPG 语法加亮"
-#: app/kateconfigdialog.cpp:222
-msgid "&Ask user"
-msgstr "询问用户(&A)"
+#: app/katemain.cpp:94 app/kwritemain.cpp:580
+msgid "Highlighting for LaTeX"
+msgstr "LaTeX 语法加亮"
-#: app/kateconfigdialog.cpp:243
-msgid "File Selector"
-msgstr "文件选择器"
+#: app/katemain.cpp:95 app/kwritemain.cpp:581
+msgid "Highlighting for Makefiles, Python"
+msgstr "Makefiles、Python 语法加亮"
-#: app/kateconfigdialog.cpp:245
-msgid "File Selector Settings"
-msgstr "文件选择器设置"
+#: app/katemain.cpp:96 app/kwritemain.cpp:582
+msgid "Highlighting for Python"
+msgstr "Python 语法加亮"
-#: app/kateconfigdialog.cpp:252
-msgid "Document List"
-msgstr "文档列表"
+#: app/katemain.cpp:98 app/kwritemain.cpp:584
+msgid "Highlighting for Scheme"
+msgstr "Scheme 语法加亮"
-#: app/kateconfigdialog.cpp:253
-msgid "Document List Settings"
-msgstr "文档列表设置"
+#: app/katemain.cpp:99 app/kwritemain.cpp:585
+msgid "PHP Keyword/Datatype list"
+msgstr "PHP 关键字/数据类型列表"
-#: app/kateconfigdialog.cpp:260 app/kateconfigdialog.cpp:317
-msgid "Plugins"
-msgstr "插件"
+#: app/katemain.cpp:100 app/kwritemain.cpp:586
+msgid "Very nice help"
+msgstr "很好的帮助"
-#: app/kateconfigdialog.cpp:261
-msgid "Plugin Manager"
-msgstr "插件管理器"
+#: app/katemain.cpp:101 app/kwritemain.cpp:587
+msgid "All people who have contributed and I have forgotten to mention"
+msgstr "所有做出贡献而我却没能提到的人员"
-#: app/kateconfigdialog.cpp:276 app/kateconfigdialog.cpp:282
-msgid "Editor"
-msgstr "编辑器"
+#: app/kateapp.cpp:214 app/kateapp.cpp:326 app/kwritemain.cpp:686
+msgid ""
+"The file '%1' could not be opened: it is not a normal file, it is a folder."
+msgstr "无法打开文件“%1”;它不是一个普通文件,而是一个文件夹。"
#: app/kategrepdialog.cpp:102
msgid "Pattern:"
@@ -820,339 +701,549 @@ msgstr "<strong>错误:</strong><p>"
msgid "Grep Tool Error"
msgstr "Grep 工具错误"
-#: app/katemain.cpp:41
-msgid "Start Kate with a given session"
-msgstr "以给定会话启动 Kate"
+#: app/katedocmanager.cpp:395
+msgid ""
+"<p>The document '%1' has been modified, but not saved."
+"<p>Do you want to save your changes or discard them?"
+msgstr "<p>文档“%1”已经被修改,但尚未保存。<p>您是否想要保存更改还是丢弃更改?"
-#: app/katemain.cpp:43
-msgid "Use a already running kate instance (if possible)"
-msgstr "使用已经运行的 Kate 实例(如果有的话)"
+#: app/katedocmanager.cpp:397
+msgid "Close Document"
+msgstr "关闭文档"
-#: app/katemain.cpp:45
-msgid "Only try to reuse kate instance with this pid"
-msgstr "只试着重用此 pid 的 Kate 实例"
+#: app/katedocmanager.cpp:484
+msgid "Reopening files from the last session..."
+msgstr "重新打开前次会话中的文件..."
-#: app/katemain.cpp:47 app/kwritemain.cpp:532
-msgid "Set encoding for the file to open"
-msgstr "设定打开文件所用的编码"
+#: app/katedocmanager.cpp:491
+msgid "Starting Up"
+msgstr "启动"
-#: app/katemain.cpp:49 app/kwritemain.cpp:533
-msgid "Navigate to this line"
-msgstr "转到这一行"
+#: app/katemwmodonhddialog.cpp:61
+msgid "Documents Modified on Disk"
+msgstr "文档已在磁盘上修改"
-#: app/katemain.cpp:51 app/kwritemain.cpp:534
-msgid "Navigate to this column"
-msgstr "转到这一列"
+#: app/katemwmodonhddialog.cpp:63
+msgid "&Ignore"
+msgstr "忽略(&I)"
-#: app/katemain.cpp:53 app/kwritemain.cpp:531
-msgid "Read the contents of stdin"
-msgstr "读取标准输入设备上的内容"
+#: app/katemwmodonhddialog.cpp:64
+msgid "&Overwrite"
+msgstr "覆盖(&O)"
-#: app/katemain.cpp:54 app/kwritemain.cpp:535
-msgid "Document to open"
-msgstr "要打开的文档"
+#: app/katemwmodonhddialog.cpp:68
+msgid ""
+"Removes the modified flag from the selected documents and closes the dialog if "
+"there are no more unhandled documents."
+msgstr "从选中文档中删除修改标记,如果没有其它未处理的文档的话,并关闭对话框。"
-#: app/katemain.cpp:63
-msgid "Kate"
-msgstr "Kate"
+#: app/katemwmodonhddialog.cpp:71
+msgid ""
+"Overwrite selected documents, discarding the disk changes and closes the dialog "
+"if there are no more unhandled documents."
+msgstr "覆盖选中的文档,丢弃磁盘上的更改,如果没有其它未处理的文档的话,关闭对话框。"
-#: app/katemain.cpp:64
-msgid "Kate - Advanced Text Editor"
-msgstr "Kate - 高级文本编辑器"
+#: app/katemwmodonhddialog.cpp:74
+msgid ""
+"Reloads the selected documents from disk and closes the dialog if there are no "
+"more unhandled documents."
+msgstr "从磁盘中重新装入选中文档,如果没有其它未处理的文档的话,关闭对话框。"
-#: app/katemain.cpp:65 app/kwritemain.cpp:552
-msgid "(c) 2000-2005 The Kate Authors"
-msgstr "(c) 2000-2005 Kate 作者"
+#: app/katemwmodonhddialog.cpp:87
+msgid ""
+"<qt>The documents listed below has changed on disk."
+"<p>Select one or more at the time and press an action button until the list is "
+"empty.</qt>"
+msgstr "<qt>下面列出的文档在磁盘上已经发生了更改。<p>一次选择一个或多个文档,然后按下操作按钮,直到此列表变空。</qt>"
-#: app/katemain.cpp:67 app/kwritemain.cpp:554
-msgid "Maintainer"
-msgstr "维护者"
+#: app/katemwmodonhddialog.cpp:93
+msgid "Filename"
+msgstr "文件名"
-#: app/katemain.cpp:68 app/katemain.cpp:69 app/katemain.cpp:70
-#: app/katemain.cpp:75 app/kwritemain.cpp:555 app/kwritemain.cpp:556
-#: app/kwritemain.cpp:557 app/kwritemain.cpp:562
-msgid "Core Developer"
-msgstr "核心开发"
+#: app/katemwmodonhddialog.cpp:94
+msgid "Status on Disk"
+msgstr "磁盘上的状态"
-#: app/katemain.cpp:71 app/kwritemain.cpp:558
-msgid "The cool buffersystem"
-msgstr "极好的缓冲系统"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Modified"
+msgstr "已修改"
-#: app/katemain.cpp:72 app/kwritemain.cpp:559
-msgid "The Editing Commands"
-msgstr "编辑命令"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Created"
+msgstr "已创建"
-#: app/katemain.cpp:73 app/kwritemain.cpp:560
-msgid "Testing, ..."
-msgstr "测试、..."
+#: app/katemwmodonhddialog.cpp:98
+msgid "Deleted"
+msgstr "已删除"
-#: app/katemain.cpp:74 app/kwritemain.cpp:561
-msgid "Former Core Developer"
-msgstr "先前核心开发者"
+#: app/katemwmodonhddialog.cpp:108
+msgid "&View Difference"
+msgstr "查看差异(&V)"
-#: app/katemain.cpp:76 app/kwritemain.cpp:563
-msgid "KWrite Author"
-msgstr "KWrite 作者"
+#: app/katemwmodonhddialog.cpp:111
+msgid ""
+"Calculates the difference between the the editor contents and the disk file for "
+"the selected document, and shows the difference with the default application. "
+"Requires diff(1)."
+msgstr "计算选中文档的编辑器内容和磁盘文件之间的差异,然后用默认应用程序显示差异。需要 diff(1)。"
-#: app/katemain.cpp:77 app/kwritemain.cpp:564
-msgid "KWrite port to KParts"
-msgstr "KWrite 移植到 KParts"
+#: app/katemwmodonhddialog.cpp:163
+msgid ""
+"Could not save the document \n"
+"'%1'"
+msgstr ""
+"无法保存文档\n"
+"“%1”"
-#: app/katemain.cpp:80 app/kwritemain.cpp:567
-msgid "KWrite Undo History, Kspell integration"
-msgstr "KWrite 撤销历史,Kspell 集成"
+#: app/katemwmodonhddialog.cpp:268
+msgid ""
+"The diff command failed. Please make sure that diff(1) is installed and in your "
+"PATH."
+msgstr "diff 命令失败。请确定 diff(1) 已经安装并且在您的路径中。"
-#: app/katemain.cpp:81 app/kwritemain.cpp:568
-msgid "KWrite XML Syntax highlighting support"
-msgstr "KWrite XML 语法加亮支持"
+#: app/katemwmodonhddialog.cpp:270
+msgid "Error Creating Diff"
+msgstr "创建 Diff 失败"
-#: app/katemain.cpp:82 app/kwritemain.cpp:569
-msgid "Patches and more"
-msgstr "补丁及其它"
+#: app/katemailfilesdialog.cpp:47
+msgid "Email Files"
+msgstr "邮寄文件"
-#: app/katemain.cpp:83
-msgid "Developer & Highlight wizard"
-msgstr "开发者和突出显示向导"
+#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
+msgid "&Show All Documents >>"
+msgstr "显示所有文档(&S) >>"
-#: app/katemain.cpp:85 app/kwritemain.cpp:571
-msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
-msgstr "RPM Spec 文件、Perl、Diff 和其它类型的语法加亮"
+#: app/katemailfilesdialog.cpp:52
+msgid "&Mail..."
+msgstr "邮寄(&M)..."
-#: app/katemain.cpp:86 app/kwritemain.cpp:572
-msgid "Highlighting for VHDL"
-msgstr "VHDL 语法加亮"
+#: app/katemailfilesdialog.cpp:57
+msgid ""
+"<p>Press <strong>Mail...</strong> to email the current document."
+"<p>To select more documents to send, press <strong>Show All "
+"Documents&nbsp;&gt;&gt;</strong>."
+msgstr ""
+"<p>按 <strong>邮寄...</strong> 来把当前文档作为电子邮件发送。 "
+"<p>要选择更多文件进行,请按 <strong>显示所有文档&nbsp;&gt;&gt;</strong>。"
-#: app/katemain.cpp:87 app/kwritemain.cpp:573
-msgid "Highlighting for SQL"
-msgstr "SQL 语法加亮"
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
+#: app/katemailfilesdialog.cpp:62
+msgid "URL"
+msgstr "URL"
-#: app/katemain.cpp:88 app/kwritemain.cpp:574
-msgid "Highlighting for Ferite"
-msgstr "Ferite 语法加亮"
+#: app/katemailfilesdialog.cpp:104
+msgid "&Hide Document List <<"
+msgstr "隐藏文档列表(&H) <<"
-#: app/katemain.cpp:89 app/kwritemain.cpp:575
-msgid "Highlighting for ILERPG"
-msgstr "ILERPG 语法加亮"
+#: app/katemailfilesdialog.cpp:105
+msgid "Press <strong>Mail...</strong> to send selected documents"
+msgstr "按 <strong>邮寄...</strong> 来发送选定的文档"
-#: app/katemain.cpp:90 app/kwritemain.cpp:576
-msgid "Highlighting for LaTeX"
-msgstr "LaTeX 语法加亮"
+#: app/katefileselector.cpp:170
+msgid "Current Document Folder"
+msgstr "当前文档文件夹"
-#: app/katemain.cpp:91 app/kwritemain.cpp:577
-msgid "Highlighting for Makefiles, Python"
-msgstr "Makefiles、Python 语法加亮"
+#: app/katefileselector.cpp:198
+msgid ""
+"<p>Here you can enter a path for a folder to display."
+"<p>To go to a folder previously entered, press the arrow on the right and "
+"choose one. "
+"<p>The entry has folder completion. Right-click to choose how completion should "
+"behave."
+msgstr ""
+"<p>此处您可以输入要显示的文件夹路径。"
+"<p>要转到先前输入的文件夹,请按右侧的箭头,然后从中选择一个。"
+"<p>此输入框具有文件夹补齐功能。右键点击可选择补齐的方式。"
-#: app/katemain.cpp:92 app/kwritemain.cpp:578
-msgid "Highlighting for Python"
-msgstr "Python 语法加亮"
+#: app/katefileselector.cpp:203
+msgid ""
+"<p>Here you can enter a name filter to limit which files are displayed."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
+msgstr ""
+"<p>此处您可以输入名称过滤器来限制要显示的文件。"
+"<p>要清除过滤器,点击弹起左边的过滤器按钮。"
+"<p>要重新应用刚才使用的过滤器,按下过滤器按钮即可。"
-#: app/katemain.cpp:94 app/kwritemain.cpp:580
-msgid "Highlighting for Scheme"
-msgstr "Scheme 语法加亮"
+#: app/katefileselector.cpp:207
+msgid ""
+"<p>This button clears the name filter when toggled off, or reapplies the last "
+"filter used when toggled on."
+msgstr "<p>该按钮在关闭时会清除名称过滤器,按下时重新应用刚才使用的过滤器。"
-#: app/katemain.cpp:95 app/kwritemain.cpp:581
-msgid "PHP Keyword/Datatype list"
-msgstr "PHP 关键字/数据类型列表"
+#: app/katefileselector.cpp:321
+msgid "Apply last filter (\"%1\")"
+msgstr "应用上次使用的过滤器(“%1”)"
-#: app/katemain.cpp:96 app/kwritemain.cpp:582
-msgid "Very nice help"
-msgstr "很好的帮助"
+#: app/katefileselector.cpp:326
+msgid "Clear filter"
+msgstr "清除过滤器"
-#: app/katemain.cpp:97 app/kwritemain.cpp:583
-msgid "All people who have contributed and I have forgotten to mention"
-msgstr "所有做出贡献而我却没能提到的人员"
+#: app/katefileselector.cpp:536
+msgid "Toolbar"
+msgstr "工具栏"
+
+#: app/katefileselector.cpp:538
+msgid "A&vailable actions:"
+msgstr "可用的动作(&V):"
+
+#: app/katefileselector.cpp:539
+msgid "S&elected actions:"
+msgstr "选用的动作(&E):"
+
+#: app/katefileselector.cpp:547
+msgid "Auto Synchronization"
+msgstr "自动同步"
+
+#: app/katefileselector.cpp:548
+msgid "When a docu&ment becomes active"
+msgstr "每当文档变为活跃(&M)"
+
+#: app/katefileselector.cpp:549
+msgid "When the file selector becomes visible"
+msgstr "每当文件选择器出现"
+
+#: app/katefileselector.cpp:556
+msgid "Remember &locations:"
+msgstr "记住位置数(&L):"
+
+#: app/katefileselector.cpp:563
+msgid "Remember &filters:"
+msgstr "记住过滤器数(&F):"
+
+#: app/katefileselector.cpp:570
+msgid "Session"
+msgstr "会话"
+
+#: app/katefileselector.cpp:571
+msgid "Restore loca&tion"
+msgstr "恢复位置(&T)"
-#: _translatorinfo.cpp:1 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:572
+msgid "Restore last f&ilter"
+msgstr "恢复最后使用的过滤器(&I)"
+
+#: app/katefileselector.cpp:592
msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Simplified Chinese Translation Team"
+"<p>Decides how many locations to keep in the history of the location combo box."
+msgstr "<p>决定要在位置组合框的历史中保留多少位置。"
-#: _translatorinfo.cpp:3 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:597
msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+"<p>Decides how many filters to keep in the history of the filter combo box."
+msgstr "<p>决定要在过滤器组合框的历史中保留多少过滤器。"
-#: app/katedocmanager.cpp:395
+#: app/katefileselector.cpp:602
msgid ""
-"<p>The document '%1' has been modified, but not saved."
-"<p>Do you want to save your changes or discard them?"
-msgstr "<p>文档“%1”已经被修改,但尚未保存。<p>您是否想要保存更改还是丢弃更改?"
+"<p>These options allow you to have the File Selector automatically change "
+"location to the folder of the active document on certain events."
+"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
+"the file selector is visible."
+"<p>None of these are enabled by default, but you can always sync the location "
+"by pressing the sync button in the toolbar."
+msgstr ""
+"<p>这些选项会允许文件选择器在某些事件发生时自动转到活跃文档的文件夹。"
+"<p>自动同步具有<em>惰性</em>,这意味着它直到文件选择器处于可见状态时才会生效。"
+"<p>这些选项默认都不被启用,但是您可以随时按工具栏上的同步按钮来同步位置。"
-#: app/katedocmanager.cpp:397
-msgid "Close Document"
-msgstr "关闭文档"
+#: app/katefileselector.cpp:611
+msgid ""
+"<p>If this option is enabled (default), the location will be restored when you "
+"start Kate."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the location is always restored."
+msgstr ""
+"<p>如果启用此选项(默认),当您启动 Kate 时,位置会被恢复。"
+"<p><strong>注意</strong>,如果会话由 TDE 会话管理器处理,位置将总是会被恢复。"
-#: app/katedocmanager.cpp:483
-msgid "Reopening files from the last session..."
-msgstr "重新打开前次会话中的文件..."
+#: app/katefileselector.cpp:615
+msgid ""
+"<p>If this option is enabled (default), the current filter will be restored "
+"when you start Kate."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the filter is always restored."
+"<p><strong>Note</strong> that some of the autosync settings may override the "
+"restored location if on."
+msgstr ""
+"<p>如果启用此选项(默认),当您启动 Kate 时,当前使用的过滤器会被恢复。"
+"<p><strong>注意</strong>,如果会话由 TDE 会话管理器处理,过滤器将总是会被恢复。"
+"<p><strong>注意</strong>,某些自动同步设置若被启用可能会优先于恢复的位置。"
-#: app/katedocmanager.cpp:490
-msgid "Starting Up"
-msgstr "启动"
+#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
+#: app/kateconfigdialog.cpp:204 app/kateconfigdialog.cpp:273
+#: app/kateconfigdialog.cpp:282 app/kateconfigdialog.cpp:290
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:347
+msgid "Application"
+msgstr "应用程序"
-#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
-msgid "Default Session"
-msgstr "默认会话"
+#: app/kateconfigdialog.cpp:97
+msgid "General"
+msgstr "常规"
-#: app/katesession.cpp:82
-msgid "Unnamed Session"
-msgstr "未命名会话"
+#: app/kateconfigdialog.cpp:98
+msgid "General Options"
+msgstr "常规选项"
-#: app/katesession.cpp:104
-msgid "Session (%1)"
-msgstr "会话(%1)"
+#: app/kateconfigdialog.cpp:105
+msgid "&Appearance"
+msgstr "外观(&A)"
-#: app/katesession.cpp:384
-msgid "Save Session?"
-msgstr "保存会话吗?"
+#: app/kateconfigdialog.cpp:110
+msgid "&Show full path in title"
+msgstr "在标题中显示完整路径(&S)"
-#: app/katesession.cpp:391
-msgid "Save current session?"
-msgstr "保存当前会话吗?"
+#: app/kateconfigdialog.cpp:112
+msgid ""
+"If this option is checked, the full document path will be shown in the window "
+"caption."
+msgstr "如果该选项被选,在窗口标题处将会显示完整的文档路径。"
-#: app/katesession.cpp:392
-msgid "Do not ask again"
-msgstr "不再询问"
+#: app/kateconfigdialog.cpp:117
+msgid "Sort &files alphabetically in the file list"
+msgstr ""
-#: app/katesession.cpp:482
-msgid "No session selected to open."
-msgstr "未选择要打开的会话。"
+#: app/kateconfigdialog.cpp:120
+#, fuzzy
+msgid ""
+"If this is checked, the files in the file list will be sorted alphabetically."
+msgstr "如果该选项被选,在窗口标题处将会显示完整的文档路径。"
-#: app/katesession.cpp:482
-msgid "No Session Selected"
-msgstr "未选择会话"
+#: app/kateconfigdialog.cpp:124
+msgid "&Behavior"
+msgstr "行为(&B)"
-#: app/katesession.cpp:554
-msgid "Specify Name for Current Session"
-msgstr "指定当前会话的名称"
+#: app/kateconfigdialog.cpp:129
+msgid "&Number of recent files:"
+msgstr ""
-#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
-msgid "Session name:"
-msgstr "会话名称:"
+#: app/kateconfigdialog.cpp:134
+msgid ""
+"<qt>Sets the number of recent files remembered by Kate."
+"<p><strong>NOTE: </strong>If you set this lower than the current value, the "
+"list will be truncated and some items forgotten.</qt>"
+msgstr ""
-#: app/katesession.cpp:561
-msgid "To save a new session, you must specify a name."
-msgstr "要保存新会话,您必须指定名称。"
+#: app/kateconfigdialog.cpp:143
+msgid "Always use the current instance of kate to open new files"
+msgstr ""
-#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
-msgid "Missing Session Name"
-msgstr "缺少会话名称"
+#: app/kateconfigdialog.cpp:146
+msgid ""
+"When checked, all files opened from outside of Kate will only use the currently "
+"opened instance of Kate."
+msgstr ""
-#: app/katesession.cpp:572
-msgid "Specify New Name for Current Session"
-msgstr "为当前会话指定新名称"
+#: app/kateconfigdialog.cpp:152
+msgid "Sync &terminal emulator with active document"
+msgstr "使终端仿真器与当前文档同步(&T)"
-#: app/katesession.cpp:579 app/katesession.cpp:857
-msgid "To save a session, you must specify a name."
-msgstr "要保存会话,您必须指定名称。"
+#: app/kateconfigdialog.cpp:155
+msgid ""
+"If this is checked, the built in Konsole will <code>cd</code> "
+"to the directory of the active document when started and whenever the active "
+"document changes, if the document is a local file."
+msgstr ""
+"如果选中此选项,对于本地文件,内建的 Konsole 将会在启动以及活跃文档改变时使用 <code>cd</code> 命令转到活跃文档所在的目录。"
-#: app/katesession.cpp:618
-msgid "Session Chooser"
-msgstr "会话选择器"
+#: app/kateconfigdialog.cpp:162
+msgid "Wa&rn about files modified by foreign processes"
+msgstr "当文件被外部进程修改时给出警告(&R)"
-#: app/katesession.cpp:623 app/katesession.cpp:715
-msgid "Open Session"
-msgstr "打开会话"
+#: app/kateconfigdialog.cpp:165
+msgid ""
+"If enabled, when Kate receives focus you will be asked what to do with files "
+"that have been modified on the hard disk. If not enabled, you will be asked "
+"what to do with a file that has been modified on the hard disk only when that "
+"file gains focus inside Kate."
+msgstr ""
+"启用时,Kate 会在获得焦点后询问您如何处理硬盘上已经被修改的文件。如果未启用,直到在硬盘上已被修改的文件在 Kate 中获得焦点的时候,您才会被询问。"
-#: app/katesession.cpp:624
-msgid "New Session"
-msgstr "新建会话"
+#: app/kateconfigdialog.cpp:173
+msgid "Meta-Information"
+msgstr "元信息"
-#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
-msgid "Session Name"
-msgstr "会话名称"
+#: app/kateconfigdialog.cpp:178
+msgid "Keep &meta-information past sessions"
+msgstr "在会话中保留元信息(&M)"
-#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
-msgid "Open Documents"
-msgstr "打开文档"
+#: app/kateconfigdialog.cpp:181
+msgid ""
+"Check this if you want document configuration like for example bookmarks to be "
+"saved past editor sessions. The configuration will be restored if the document "
+"has not changed when reopened."
+msgstr "如果您想要在编辑器的不同会话中保存像书签这样的文档配置,请选中此项。如果重新打开文档的时候文档没有更改,则会恢复配置文件。"
-#: app/katesession.cpp:660
-msgid "&Always use this choice"
-msgstr "总是使用此选择(&A)"
+#: app/kateconfigdialog.cpp:189
+msgid "&Delete unused meta-information after:"
+msgstr "删除无用的元信息,等(&D):"
-#: app/katesession.cpp:720
-msgid "&Open"
-msgstr "打开(&O)"
+#: app/kateconfigdialog.cpp:191
+msgid "(never)"
+msgstr "(从不)"
-#: app/katesession.cpp:781
-msgid "Manage Sessions"
-msgstr "管理会话"
+#: app/kateconfigdialog.cpp:192
+msgid " day(s)"
+msgstr " 天"
-#: app/katesession.cpp:810
-msgid "&Rename..."
-msgstr "重命名(&R)..."
+#: app/kateconfigdialog.cpp:204
+msgid "Sessions"
+msgstr "会话"
-#: app/katesession.cpp:850
-msgid "Specify New Name for Session"
-msgstr "指定会话的新名称"
+#: app/kateconfigdialog.cpp:205
+msgid "Session Management"
+msgstr "会话管理"
+
+#: app/kateconfigdialog.cpp:211
+msgid "Elements of Sessions"
+msgstr "会话元素"
-#: app/katefilelist.cpp:139
+#: app/kateconfigdialog.cpp:216
+msgid "Include &window configuration"
+msgstr "包含窗口配置(&W)"
+
+#: app/kateconfigdialog.cpp:220
+msgid ""
+"Check this if you want all your views and frames restored each time you open "
+"Kate"
+msgstr "如果您希望在每次打开 Kate 时都恢复所有视图和框架,启用此选项。"
+
+#: app/kateconfigdialog.cpp:225
+msgid "Behavior on Application Startup"
+msgstr "应用启动时的行为"
+
+#: app/kateconfigdialog.cpp:229
+msgid "&Start new session"
+msgstr "启动新会话(&S)"
+
+#: app/kateconfigdialog.cpp:230
+msgid "&Load last-used session"
+msgstr "装入上次使用的会话(&L)"
+
+#: app/kateconfigdialog.cpp:231
+msgid "&Manually choose a session"
+msgstr "手动选择会话(&M)"
+
+#: app/kateconfigdialog.cpp:246
+msgid "Behavior on Application Exit or Session Switch"
+msgstr "应用程序退出或会话切换时的行为"
+
+#: app/kateconfigdialog.cpp:250
+msgid "&Do not save session"
+msgstr "不保存会话(&D)"
+
+#: app/kateconfigdialog.cpp:251
+msgid "&Save session"
+msgstr "保存会话(&S)"
+
+#: app/kateconfigdialog.cpp:252
+msgid "&Ask user"
+msgstr "询问用户(&A)"
+
+#: app/kateconfigdialog.cpp:273
+msgid "File Selector"
+msgstr "文件选择器"
+
+#: app/kateconfigdialog.cpp:275
+msgid "File Selector Settings"
+msgstr "文件选择器设置"
+
+#: app/kateconfigdialog.cpp:282
+msgid "Document List"
+msgstr "文档列表"
+
+#: app/kateconfigdialog.cpp:283
+msgid "Document List Settings"
+msgstr "文档列表设置"
+
+#: app/kateconfigdialog.cpp:290 app/kateconfigdialog.cpp:347
+msgid "Plugins"
+msgstr "插件"
+
+#: app/kateconfigdialog.cpp:291
+msgid "Plugin Manager"
+msgstr "插件管理器"
+
+#: app/kateconfigdialog.cpp:306 app/kateconfigdialog.cpp:312
+msgid "Editor"
+msgstr "编辑器"
+
+#: app/katefilelist.cpp:141
msgid "Sort &By"
msgstr "排序方式(&B)"
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:143
+msgid "Move File Up"
+msgstr ""
+
+#: app/katefilelist.cpp:145
+msgid "Move File Down"
+msgstr ""
+
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
msgid "Opening Order"
msgstr "打开顺序"
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
msgid "Document Name"
msgstr "文档名称"
-#: app/katefilelist.cpp:373
+#: app/katefilelist.cpp:150
+msgid "Manual Placement"
+msgstr ""
+
+#: app/katefilelist.cpp:432
msgid ""
"<b>This file was changed (modified) on disk by another program.</b><br />"
msgstr "<b>磁盘上的这个文件被另一个程序改变(修改)。</b><br />"
-#: app/katefilelist.cpp:375
+#: app/katefilelist.cpp:434
msgid ""
"<b>This file was changed (created) on disk by another program.</b><br />"
msgstr "<b>磁盘上的这个文件被另一个程序改变(创建)。</b><br />"
-#: app/katefilelist.cpp:377
+#: app/katefilelist.cpp:436
msgid ""
"<b>This file was changed (deleted) on disk by another program.</b><br />"
msgstr "<b>磁盘上的这个文件被另一个程序改变(删除)。</b><br />"
-#: app/katefilelist.cpp:553
+#: app/katefilelist.cpp:662
msgid "Background Shading"
msgstr "背景阴影"
-#: app/katefilelist.cpp:559
+#: app/katefilelist.cpp:668
msgid "&Enable background shading"
msgstr "启用背景阴影(&E)"
-#: app/katefilelist.cpp:563
+#: app/katefilelist.cpp:672
msgid "&Viewed documents' shade:"
msgstr "查看过的文档的阴影(&V):"
-#: app/katefilelist.cpp:568
+#: app/katefilelist.cpp:677
msgid "&Modified documents' shade:"
msgstr "修改过的文档的阴影(&M):"
-#: app/katefilelist.cpp:575
+#: app/katefilelist.cpp:684
msgid "&Sort by:"
msgstr "排序方式(&B):"
-#: app/katefilelist.cpp:585
+#: app/katefilelist.cpp:694
msgid ""
"When background shading is enabled, documents that have been viewed or edited "
"within the current session will have a shaded background. The most recent "
"documents have the strongest shade."
msgstr "启用背景阴影的时候,当前会话被查看或编辑过的文档都会有阴影。最近的文档的阴影最强烈。"
-#: app/katefilelist.cpp:589
+#: app/katefilelist.cpp:698
msgid "Set the color for shading viewed documents."
msgstr "设置对查看过的文档所设置的阴影颜色。"
-#: app/katefilelist.cpp:591
+#: app/katefilelist.cpp:700
msgid ""
"Set the color for modified documents. This color is blended into the color for "
"viewed files. The most recently edited documents get most of this color."
msgstr "设定修改过的文档的颜色。此颜色将会叠加到查看过的文件的颜色上。越近编辑过的文档,叠加后的颜色中此颜色的比例越大。"
-#: app/katefilelist.cpp:596
+#: app/katefilelist.cpp:705
msgid "Set the sorting method for the documents."
msgstr "设定文档的排序方式。"
@@ -1185,8 +1276,9 @@ msgid "Create another view containing the current document"
msgstr "创建另一个包含当前文档的视图"
#: app/kwritemain.cpp:157
-msgid "Choose Editor..."
-msgstr "选择编辑器..."
+#, fuzzy
+msgid "Choose Editor Component..."
+msgstr "选择编辑器组件"
#: app/kwritemain.cpp:159
msgid "Override the system wide setting for the default editing component"
@@ -1222,23 +1314,152 @@ msgid ""
"the current user."
msgstr "给定的文件不能读取,请检查文件是否存在或当前用户是否有权限读取。"
-#: app/kwritemain.cpp:549
+#: app/kwritemain.cpp:553
msgid "KWrite"
msgstr "KWrite"
-#: app/kwritemain.cpp:551
+#: app/kwritemain.cpp:555
msgid "KWrite - Text Editor"
msgstr "KWrite - 文本编辑器"
-#: app/kateapp.cpp:210 app/kateapp.cpp:322 app/kwritemain.cpp:682
-msgid ""
-"The file '%1' could not be opened: it is not a normal file, it is a folder."
-msgstr "无法打开文件“%1”;它不是一个普通文件,而是一个文件夹。"
-
-#: app/kwritemain.cpp:696
+#: app/kwritemain.cpp:700
msgid "Choose Editor Component"
msgstr "选择编辑器组件"
+#: app/kateconsole.cpp:129
+msgid ""
+"Do you really want to pipe the text to the console? This will execute any "
+"contained commands with your user rights."
+msgstr "您真的想要将文本管道到控制台吗?这将使用您的用户权限执行其中包含的任何命令。"
+
+#: app/kateconsole.cpp:130
+msgid "Pipe to Console?"
+msgstr "管道到控制台吗?"
+
+#: app/kateconsole.cpp:131
+msgid "Pipe to Console"
+msgstr "管道到控制台"
+
+#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
+msgid "Default Session"
+msgstr "默认会话"
+
+#: app/katesession.cpp:82
+msgid "Unnamed Session"
+msgstr "未命名会话"
+
+#: app/katesession.cpp:104
+msgid "Session (%1)"
+msgstr "会话(%1)"
+
+#: app/katesession.cpp:384
+msgid "Save Session?"
+msgstr "保存会话吗?"
+
+#: app/katesession.cpp:391
+msgid "Save current session?"
+msgstr "保存当前会话吗?"
+
+#: app/katesession.cpp:392
+msgid "Do not ask again"
+msgstr "不再询问"
+
+#: app/katesession.cpp:482
+msgid "No session selected to open."
+msgstr "未选择要打开的会话。"
+
+#: app/katesession.cpp:482
+msgid "No Session Selected"
+msgstr "未选择会话"
+
+#: app/katesession.cpp:554
+msgid "Specify Name for Current Session"
+msgstr "指定当前会话的名称"
+
+#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
+msgid "Session name:"
+msgstr "会话名称:"
+
+#: app/katesession.cpp:561
+msgid "To save a new session, you must specify a name."
+msgstr "要保存新会话,您必须指定名称。"
+
+#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
+msgid "Missing Session Name"
+msgstr "缺少会话名称"
+
+#: app/katesession.cpp:572
+msgid "Specify New Name for Current Session"
+msgstr "为当前会话指定新名称"
+
+#: app/katesession.cpp:579 app/katesession.cpp:857
+msgid "To save a session, you must specify a name."
+msgstr "要保存会话,您必须指定名称。"
+
+#: app/katesession.cpp:618
+msgid "Session Chooser"
+msgstr "会话选择器"
+
+#: app/katesession.cpp:623 app/katesession.cpp:715
+msgid "Open Session"
+msgstr "打开会话"
+
+#: app/katesession.cpp:624
+msgid "New Session"
+msgstr "新建会话"
+
+#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
+msgid "Session Name"
+msgstr "会话名称"
+
+#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
+msgid "Open Documents"
+msgstr "打开文档"
+
+#: app/katesession.cpp:660
+msgid "&Always use this choice"
+msgstr "总是使用此选择(&A)"
+
+#: app/katesession.cpp:720
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: app/katesession.cpp:781
+msgid "Manage Sessions"
+msgstr "管理会话"
+
+#: app/katesession.cpp:810
+msgid "&Rename..."
+msgstr "重命名(&R)..."
+
+#: app/katesession.cpp:850
+msgid "Specify New Name for Session"
+msgstr "指定会话的新名称"
+
+#: app/kateviewspace.cpp:321 app/kateviewspace.cpp:360
+msgid " INS "
+msgstr " 插入 "
+
+#: app/kateviewspace.cpp:326 app/kateviewspace.cpp:364
+msgid " NORM "
+msgstr " 普通 "
+
+#: app/kateviewspace.cpp:352
+msgid " Line: %1 Col: %2 "
+msgstr " 行:%1 列:%2 "
+
+#: app/kateviewspace.cpp:356
+msgid " R/O "
+msgstr " 只读 "
+
+#: app/kateviewspace.cpp:358
+msgid " OVR "
+msgstr " 改写 "
+
+#: app/kateviewspace.cpp:364
+msgid " BLK "
+msgstr " 块 "
+
#: app/kateviewmanager.cpp:97
msgid "New Tab"
msgstr "新建标签"
@@ -1303,81 +1524,6 @@ msgstr "打开新标签"
msgid "Close the current tab"
msgstr "关闭当前标签"
-#: app/katemdi.cpp:140
-msgid "Tool &Views"
-msgstr "工具视图(&V)"
-
-#: app/katemdi.cpp:141
-msgid "Show Side&bars"
-msgstr "显示侧边栏(&B)"
-
-#: app/katemdi.cpp:143
-msgid "Hide Side&bars"
-msgstr "隐藏侧边栏(&B)"
-
-#: app/katemdi.cpp:176
-#, c-format
-msgid "Show %1"
-msgstr "显示%1"
-
-#: app/katemdi.cpp:179
-#, c-format
-msgid "Hide %1"
-msgstr "隐藏%1"
-
-#: app/katemdi.cpp:464
-msgid "Behavior"
-msgstr "行为"
-
-#: app/katemdi.cpp:466
-msgid "Make Non-Persistent"
-msgstr "变成非永久"
-
-#: app/katemdi.cpp:466
-msgid "Make Persistent"
-msgstr "变成永久"
-
-#: app/katemdi.cpp:468
-msgid "Move To"
-msgstr "移至"
-
-#: app/katemdi.cpp:471
-msgid "Left Sidebar"
-msgstr "左侧边栏"
-
-#: app/katemdi.cpp:474
-msgid "Right Sidebar"
-msgstr "右侧边栏"
-
-#: app/katemdi.cpp:477
-msgid "Top Sidebar"
-msgstr "上侧边栏"
-
-#: app/katemdi.cpp:480
-msgid "Bottom Sidebar"
-msgstr "下侧边栏"
-
-#: app/katemdi.cpp:778
-msgid ""
-"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
-"to directly access the tool views with the mouse anymore, so if you need to "
-"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
-"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
-"the assigned shortcuts.</qt>"
-msgstr ""
-"<qt>您即将隐藏侧边栏。侧边栏一旦隐藏,将无法通过鼠标直接访问工具视图。如果您需要再次访问侧边栏的话,请从菜单中调用<b>"
-"窗口 &gt; 工具视图 &gt; 显示侧边栏</b>。您还可以通过指派的快捷键显示/隐藏工具视图。</qt>"
-
-#: app/kateconfigplugindialogpage.cpp:82
-msgid "Comment"
-msgstr "注释"
-
-#: app/kateconfigplugindialogpage.cpp:83
-msgid ""
-"Here you can see all available Kate plugins. Those with a check mark are "
-"loaded, and will be loaded again the next time Kate is started."
-msgstr "此处您可以看到所有可用的 Kate 插件。那些带有选择标记的插件已被载入,并且在 Kate 下次启动时还会被载入。"
-
#: app/katesavemodifieddialog.cpp:78
msgid "Save As (%1)"
msgstr "另存为(%1)"
@@ -1422,135 +1568,209 @@ msgid ""
"to proceed."
msgstr "您请求保存的数据无法写入。请选择您想要如何继续。"
-#: app/katefileselector.cpp:170
-msgid "Current Document Folder"
-msgstr "当前文档文件夹"
+#: app/kateexternaltools.cpp:276
+msgid "Failed to expand the command '%1'."
+msgstr "展开命令“%1”失败。"
-#: app/katefileselector.cpp:198
+#: app/kateexternaltools.cpp:277
+msgid "Kate External Tools"
+msgstr "Kate 外部工具"
+
+#: app/kateexternaltools.cpp:427
+msgid "Edit External Tool"
+msgstr "编辑外部工具"
+
+#: app/kateexternaltools.cpp:441
+msgid "&Label:"
+msgstr "标签(&L):"
+
+#: app/kateexternaltools.cpp:446
+msgid "The name will be displayed in the 'Tools->External' menu"
+msgstr "将显示于“工具->外部”菜单中的名称"
+
+#: app/kateexternaltools.cpp:456
+msgid "S&cript:"
+msgstr "脚本(&C):"
+
+#: app/kateexternaltools.cpp:461
msgid ""
-"<p>Here you can enter a path for a folder to display."
-"<p>To go to a folder previously entered, press the arrow on the right and "
-"choose one. "
-"<p>The entry has folder completion. Right-click to choose how completion should "
-"behave."
+"<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
+"for execution. The following macros will be expanded:</p>"
+"<ul>"
+"<li><code>%URL</code> - the URL of the current document."
+"<li><code>%URLs</code> - a list of the URLs of all open documents."
+"<li><code>%directory</code> - the URL of the directory containing the current "
+"document."
+"<li><code>%filename</code> - the filename of the current document."
+"<li><code>%line</code> - the current line of the text cursor in the current "
+"view."
+"<li><code>%column</code> - the column of the text cursor in the current view."
+"<li><code>%selection</code> - the selected text in the current view."
+"<li><code>%text</code> - the text of the current document.</ul>"
msgstr ""
-"<p>此处您可以输入要显示的文件夹路径。"
-"<p>要转到先前输入的文件夹,请按右侧的箭头,然后从中选择一个。"
-"<p>此输入框具有文件夹补齐功能。右键点击可选择补齐的方式。"
+"<p>调用工具要执行的脚本。脚本会传递给 /bin/sh 执行。下列宏将会被展开:</p>"
+"<ul>"
+"<li><code>%URL</code> - 当前文档的 URL。"
+"<li><code>%URLs</code> - 打开的全部文档的 URL。"
+"<li><code>%directory</code> - 包含当前文档的目录的 URL。"
+"<li><code>%filename</code> - 当前文档的文件名。"
+"<li><code>%line</code> - 当前视图中光标所在文本行号。"
+"<li><code>%column</code> - 当前视图中光标所在文本列数。"
+"<li><code>%selection</code> - 当前视图中所选的文本。"
+"<li><code>%text</code> - 当前文档的文本。</ul>"
-#: app/katefileselector.cpp:203
+#: app/kateexternaltools.cpp:479
+msgid "&Executable:"
+msgstr "可执行(&E):"
+
+#: app/kateexternaltools.cpp:484
msgid ""
-"<p>Here you can enter a name filter to limit which files are displayed."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
-msgstr ""
-"<p>此处您可以输入名称过滤器来限制要显示的文件。"
-"<p>要清除过滤器,点击弹起左边的过滤器按钮。"
-"<p>要重新应用刚才使用的过滤器,按下过滤器按钮即可。"
+"The executable used by the command. This is used to check if a tool should be "
+"displayed; if not set, the first word of <em>command</em> will be used."
+msgstr "此命令使用的可执行文件。此选项将用来检查是否要显示此工具;如果未设置的话,将会使用 <em>command</em> 的第一个单词。"
-#: app/katefileselector.cpp:207
+#: app/kateexternaltools.cpp:490
+msgid "&Mime types:"
+msgstr "MIME 类型(&M):"
+
+#: app/kateexternaltools.cpp:495
msgid ""
-"<p>This button clears the name filter when toggled off, or reapplies the last "
-"filter used when toggled on."
-msgstr "<p>该按钮在关闭时会清除名称过滤器,按下时重新应用刚才使用的过滤器。"
+"A semicolon-separated list of mime types for which this tool should be "
+"available; if this is left empty, the tool is always available. To choose from "
+"known mimetypes, press the button on the right."
+msgstr "此工具适用于的 MIME 类型列表,用分号分隔;如果为空的话,此工具将总是有效。要从已知的 MIME 类型中选择,请按右侧的按钮。"
-#: app/katefileselector.cpp:321
-msgid "Apply last filter (\"%1\")"
-msgstr "应用上次使用的过滤器(“%1”)"
+#: app/kateexternaltools.cpp:504
+msgid "Click for a dialog that can help you creating a list of mimetypes."
+msgstr "单击可出现一个帮助您创建 MIME 类型列表的对话框。"
-#: app/katefileselector.cpp:326
-msgid "Clear filter"
-msgstr "清除过滤器"
+#: app/kateexternaltools.cpp:508
+msgid "&Save:"
+msgstr "保存(&S):"
-#: app/katefileselector.cpp:536
-msgid "Toolbar"
-msgstr "工具栏"
+#: app/kateexternaltools.cpp:512
+msgid "None"
+msgstr "无"
-#: app/katefileselector.cpp:538
-msgid "A&vailable actions:"
-msgstr "可用的动作(&V):"
+#: app/kateexternaltools.cpp:512
+msgid "Current Document"
+msgstr "当前文档"
-#: app/katefileselector.cpp:539
-msgid "S&elected actions:"
-msgstr "选用的动作(&E):"
+#: app/kateexternaltools.cpp:512
+msgid "All Documents"
+msgstr "全部文档"
-#: app/katefileselector.cpp:547
-msgid "Auto Synchronization"
-msgstr "自动同步"
+#: app/kateexternaltools.cpp:516
+msgid ""
+"You can elect to save the current or all [modified] documents prior to running "
+"the command. This is helpful if you want to pass URLs to an application like, "
+"for example, an FTP client."
+msgstr "您可以选择在运行命令前先保存当前或[已修改]的全部文档。如果您想要将 URL 传递给像 FTP 客户端这样的应用程序的话,此功能将非常有用。"
-#: app/katefileselector.cpp:548
-msgid "When a docu&ment becomes active"
-msgstr "每当文档变为活跃(&M)"
+#: app/kateexternaltools.cpp:523
+msgid "&Command line name:"
+msgstr "命令行名称(&C):"
-#: app/katefileselector.cpp:549
-msgid "When the file selector becomes visible"
-msgstr "每当文件选择器出现"
+#: app/kateexternaltools.cpp:528
+msgid ""
+"If you specify a name here, you can invoke the command from the view command "
+"lines with exttool-the_name_you_specified_here. Please do not use spaces or "
+"tabs in the name."
+msgstr "如果您在此指定名称,您就可以从查看命令行中使用该名称调用该命令。请不要在名称中使用空格或跳格键。"
-#: app/katefileselector.cpp:556
-msgid "Remember &locations:"
-msgstr "记住位置数(&L):"
+#: app/kateexternaltools.cpp:539
+msgid "You must specify at least a name and a command"
+msgstr "您必须至少指定一个名称和命令"
-#: app/katefileselector.cpp:563
-msgid "Remember &filters:"
-msgstr "记住过滤器数(&F):"
+#: app/kateexternaltools.cpp:548
+msgid "Select the MimeTypes for which to enable this tool."
+msgstr "选择此工具适用的 MIME 类型。"
-#: app/katefileselector.cpp:570
-msgid "Session"
-msgstr "会话"
+#: app/kateexternaltools.cpp:550
+msgid "Select Mime Types"
+msgstr "选择 MIME 类型"
-#: app/katefileselector.cpp:571
-msgid "Restore loca&tion"
-msgstr "恢复位置(&T)"
+#: app/kateexternaltools.cpp:568
+msgid "&New..."
+msgstr "新建(&N)..."
-#: app/katefileselector.cpp:572
-msgid "Restore last f&ilter"
-msgstr "恢复最后使用的过滤器(&I)"
+#: app/kateexternaltools.cpp:576
+msgid "&Edit..."
+msgstr "编辑(&E)..."
-#: app/katefileselector.cpp:592
-msgid ""
-"<p>Decides how many locations to keep in the history of the location combo box."
-msgstr "<p>决定要在位置组合框的历史中保留多少位置。"
+#: app/kateexternaltools.cpp:580
+msgid "Insert &Separator"
+msgstr "插入分隔符(&S)"
-#: app/katefileselector.cpp:597
+#: app/kateexternaltools.cpp:602
msgid ""
-"<p>Decides how many filters to keep in the history of the filter combo box."
-msgstr "<p>决定要在过滤器组合框的历史中保留多少过滤器。"
+"This list shows all the configured tools, represented by their menu text."
+msgstr "此列表显示了配置的全部工具,各选项用菜单文字代表。"
-#: app/katefileselector.cpp:602
-msgid ""
-"<p>These options allow you to have the File Selector automatically change "
-"location to the folder of the active document on certain events."
-"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
-"the file selector is visible."
-"<p>None of these are enabled by default, but you can always sync the location "
-"by pressing the sync button in the toolbar."
-msgstr ""
-"<p>这些选项会允许文件选择器在某些事件发生时自动转到活跃文档的文件夹。"
-"<p>自动同步具有<em>惰性</em>,这意味着它直到文件选择器处于可见状态时才会生效。"
-"<p>这些选项默认都不被启用,但是您可以随时按工具栏上的同步按钮来同步位置。"
+#: app/katemdi.cpp:140
+msgid "Tool &Views"
+msgstr "工具视图(&V)"
-#: app/katefileselector.cpp:611
-msgid ""
-"<p>If this option is enabled (default), the location will be restored when you "
-"start Kate."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the location is always restored."
-msgstr ""
-"<p>如果启用此选项(默认),当您启动 Kate 时,位置会被恢复。"
-"<p><strong>注意</strong>,如果会话由 TDE 会话管理器处理,位置将总是会被恢复。"
+#: app/katemdi.cpp:141
+msgid "Show Side&bars"
+msgstr "显示侧边栏(&B)"
-#: app/katefileselector.cpp:615
+#: app/katemdi.cpp:143
+msgid "Hide Side&bars"
+msgstr "隐藏侧边栏(&B)"
+
+#: app/katemdi.cpp:176
+#, c-format
+msgid "Show %1"
+msgstr "显示%1"
+
+#: app/katemdi.cpp:179
+#, c-format
+msgid "Hide %1"
+msgstr "隐藏%1"
+
+#: app/katemdi.cpp:465
+msgid "Behavior"
+msgstr "行为"
+
+#: app/katemdi.cpp:467
+msgid "Make Non-Persistent"
+msgstr "变成非永久"
+
+#: app/katemdi.cpp:467
+msgid "Make Persistent"
+msgstr "变成永久"
+
+#: app/katemdi.cpp:469
+msgid "Move To"
+msgstr "移至"
+
+#: app/katemdi.cpp:472
+msgid "Left Sidebar"
+msgstr "左侧边栏"
+
+#: app/katemdi.cpp:475
+msgid "Right Sidebar"
+msgstr "右侧边栏"
+
+#: app/katemdi.cpp:478
+msgid "Top Sidebar"
+msgstr "上侧边栏"
+
+#: app/katemdi.cpp:481
+msgid "Bottom Sidebar"
+msgstr "下侧边栏"
+
+#: app/katemdi.cpp:779
msgid ""
-"<p>If this option is enabled (default), the current filter will be restored "
-"when you start Kate."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the filter is always restored."
-"<p><strong>Note</strong> that some of the autosync settings may override the "
-"restored location if on."
+"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
+"to directly access the tool views with the mouse anymore, so if you need to "
+"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
+"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
+"the assigned shortcuts.</qt>"
msgstr ""
-"<p>如果启用此选项(默认),当您启动 Kate 时,当前使用的过滤器会被恢复。"
-"<p><strong>注意</strong>,如果会话由 TDE 会话管理器处理,过滤器将总是会被恢复。"
-"<p><strong>注意</strong>,某些自动同步设置若被启用可能会优先于恢复的位置。"
+"<qt>您即将隐藏侧边栏。侧边栏一旦隐藏,将无法通过鼠标直接访问工具视图。如果您需要再次访问侧边栏的话,请从菜单中调用<b>"
+"窗口 &gt; 工具视图 &gt; 显示侧边栏</b>。您还可以通过指派的快捷键显示/隐藏工具视图。</qt>"
#. i18n: file ./data/kateui.rc line 43
#: rc.cpp:9
@@ -1570,173 +1790,5 @@ msgstr "会话(&I)"
msgid "&Window"
msgstr "窗口(&W)"
-#: tips.cpp:3
-msgid ""
-"<p>Kate comes with a nice set of plugins, providing simple\n"
-"and advanced features of all sorts.</p>\n"
-"<p>You can enable/disable plugins to suit your needs in the configuration "
-"dialog,\n"
-"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
-msgstr ""
-"<p>Kate 附带了一组不错的插件,提供了各种简单的和高级的功能。</p>"
-"<p>您可以在配置对话框中启用/禁用插件来满足您的需要,选择 <strong>设置 -&gt;configure</strong> 来启动配置对话框。</p>"
-"\n"
-
-#: tips.cpp:11
-msgid ""
-"<p>You can swap the characters on each side of the cursor just by pressing\n"
-"<strong>Ctrl+T</strong></p>\n"
-msgstr ""
-"<p>您可以交换光标两侧的字符,方法是按 <strong>Ctrl+T</strong></p>\n"
-
-#: tips.cpp:17
-msgid ""
-"<p>You can export the current document as a HTML file, including\n"
-"syntax highlighting.</p>\n"
-"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
-msgstr ""
-"<p>您可以把当前文档导出为 HTML 文件,包括语法加亮显示。</p>"
-"<p>只需选择 <strong>文件 -&gt; 导出 -&gt; HTML...</strong>即可</p>\n"
-
-#: tips.cpp:24
-msgid ""
-"<p>You can split the Kate editor as many times as you like and\n"
-"in either direction. Each frame has its own status bar and\n"
-"can display any open document.</p>\n"
-"<p>Just choose "
-"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
-msgstr ""
-"<p>您可以按任意方向多次分割 Kate 编辑器。每个框架中都有它自己的状态栏,并能够显示任何打开的文件。</p>"
-"<p>只需选择"
-"<br><strong>查看 -&gt; [ 水平 | 垂直 ]分割</strong> 即可。</p>\n"
-
-#: tips.cpp:32
-msgid ""
-"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
-"to any side that you want them in Kate, or stack them, or even tear them off "
-"the\n"
-"main window.</p>\n"
-msgstr ""
-"<p>您可以把工具视图(<em>文件列表</em>和<em>文件选择器</em>)拖放到 Kate 的任何一边上,或叠放它们,甚至从主窗口中分裂出来。</p>"
-"\n"
-
-#: tips.cpp:39
-msgid ""
-"<p>Kate has a built-in terminal emulator, just click on <strong>"
-"\"Terminal\"</strong> at\n"
-"the bottom to show or hide it as you desire.</p>\n"
-msgstr ""
-"<p>Kate 有一个内建的终端仿真器,只需点击下面的<strong>“终端”</strong>来随意显示或隐藏它。</p>\n"
-
-#: tips.cpp:45
-msgid ""
-"<p>Kate can highlight the current line with a\n"
-"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
-"width=\"100%\">"
-"<tr>"
-"<td>different\n"
-"background color.<strong>|</strong></td></tr></table></p>\n"
-"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
-"dialog.</p>\n"
-msgstr ""
-"<p>Kate 可以使用<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" "
-"cellpadding=\"0\" width=\"100%\">"
-"<tr>"
-"<td>不同的背景颜色<strong>|</strong></td></tr></table>来突出显示当前行。</p>"
-"<p>您可以在配置对话框中的<em>颜色</em>页中设置颜色。</p>\n"
-
-#: tips.cpp:54
-msgid ""
-"<p>You can open the currently edited file in any other application from within\n"
-"Kate.</p>\n"
-"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
-"configured\n"
-"for the document type. There is also an option <strong>Other...</strong> to\n"
-"choose any application on your system.</p>\n"
-msgstr ""
-"<p>您可以在 Kate 内用任何其它程序打开当前正在被编辑的文件。</p>"
-"<p>选择<strong>文件 -&gt; 打开方式</strong> 来选择配置给该文档类型的程序。其中还有一个选项<strong>"
-"其它...</strong>,您可以用它来选择系统上的任何程序。</p>\n"
-
-#: tips.cpp:64
-msgid ""
-"<p>You can configure the editor to always display the line numbers and/or\n"
-"bookmark panes when started from the <strong>View Defaults</strong> "
-"page of the\n"
-"configuration dialog.</p>\n"
-msgstr ""
-"<p>您可以在配置对话框中的<strong>视图默认值</strong>页中配置,让编辑器启动时总是显示行号和/或书签栏。</p>\n"
-
-#: tips.cpp:71
-msgid ""
-"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
-"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
-"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
-"tab (You have to be online, of course...).</p>\n"
-msgstr ""
-"<p>您可以在配置对话框中的<strong>加亮显示</strong>页上下载新的或更新的<em>语法加亮定义</em></p>"
-"<p>只需点击<em>加亮显示模式</em>标签上的<em>下载...</em>按钮即可(当然,您必须得在线才行...)。</p>\n"
-
-#: tips.cpp:79
-msgid ""
-"<p>You can cycle through all open documents by pressing <strong>"
-"Alt+Left</strong>\n"
-"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
-"displayed\n"
-"in the active frame.</p>\n"
-msgstr ""
-"<p>您可以通过按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> "
-"来循环浏览所有打开的文档。下一/前一文档将会被立即显示在活跃的框架中。</p>\n"
-
-#: tips.cpp:86
-msgid ""
-"<p>You can do cool sed-like regular expression replacements using <em>"
-"Command Line</em>.</p>\n"
-"<p>For example, press <strong>F7</strong> and enter <code>"
-"s /oldtext/newtext/g</code>\n"
-"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
-"line.</p>\n"
-msgstr ""
-"<p>您可以使用 <em>编辑命令</em> 来执行类似 sed 的正则表达式替换。</p>"
-"<p>例如,按 <strong>Ctrl+M</strong> 并输入<code>s/oldtext/newtext/g</code> "
-"会把当前行中的所有“oldtext”替换为“newtext”</p>\n"
-
-#: tips.cpp:94
-msgid ""
-"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
-"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
-msgstr ""
-"<p>您只需按 <strong>F3</strong> 来重复刚才的搜索,或者按 <strong>Shift+F3</strong> 来反向搜索。</p>\n"
-
-#: tips.cpp:100
-msgid ""
-"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
-"</p>\n"
-"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
-"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
-"current folder.</p>\n"
-"<p>The File Selector will even remember your filters for you.</strong></p>\n"
-msgstr ""
-"<p>您可以过滤显示在 <em>文件选择器</em> 工具视图中的文件。</p>"
-"<p>只需在底部的过滤器框中输入您的过滤器即可。例如:输入 <code>*.html *.php</code>"
-",如果您只想看到当前文件夹中的 HTML 和 PHP 文件。</p>"
-"<p>文件选择器甚至会记住您使用过的过滤器。</strong></p>\n"
-
-#: tips.cpp:110
-msgid ""
-"<p>You can have two views - or even more - of the same document in Kate. "
-"Editing\n"
-"in either will be reflected in both.</p>\n"
-"<p>So if you find yourself scrolling up and down to look at text at the other\n"
-"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
-"horizontally.</p>\n"
-msgstr ""
-"<p>在 Kate 中,同一文档您可以有两个视图 - 甚至更多。在任何一个视图中编辑该文档都会反映在所有视图中。</p>"
-"<p>因此,如果您需要前后寻找文档另一端的文本时,只需按 <strong>Ctrl+Shift+T</strong> 来水平分割它即可。</p>\n"
-
-#: tips.cpp:119
-msgid ""
-"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
-"next/previous frame.</p>\n"
-msgstr ""
-"<p>按 <strong>F8</strong> 或 <strong>Shift+F8</strong> 来切换到下一/前一框架。</p>\n"
+#~ msgid "Choose Editor..."
+#~ msgstr "选择编辑器..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kay.po b/tde-i18n-zh_CN/messages/tdebase/kay.po
index be0c7ec80ae..8c1d4110a9d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kay.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kay.po
@@ -4,15 +4,16 @@
msgid ""
msgstr ""
"Project-Id-Version: kay 3.5\n"
-"POT-Creation-Date: 2007-03-30 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 06:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: medianotifier.cpp:175
+#: medianotifier.cpp:209
msgid ""
"An autorun file has been found on your '%1'. Do you want to execute it?\n"
"Note that executing a file on a medium may compromise your system's security"
@@ -20,12 +21,12 @@ msgstr ""
"您的“%1”中找到了自动运行文件。您是否想要执行?\n"
"请注意,在介质上执行文件可能是系统安全的隐患"
-#: medianotifier.cpp:179
+#: medianotifier.cpp:213
#, c-format
msgid "Autorun - %1"
msgstr "自动运行 - %1"
-#: medianotifier.cpp:249
+#: medianotifier.cpp:283
msgid ""
"An autoopen file has been found on your '%1'. Do you want to open '%2'?\n"
"Note that opening a file on a medium may compromise your system's security"
@@ -33,20 +34,38 @@ msgstr ""
"您的“%1”中找到了自动打开文件。您是否想要打开“%2”?\n"
"请注意,在介质上打开文件可能是系统安全的隐患"
-#: medianotifier.cpp:253
+#: medianotifier.cpp:287
#, c-format
msgid "Autoopen - %1"
msgstr "自动打开 - %1"
-#: notificationdialog.cpp:37
+#: medianotifier.cpp:384
+msgid "Low Disk Space"
+msgstr ""
+
+#: medianotifier.cpp:388
+msgid "Start Konqueror"
+msgstr ""
+
+#: medianotifier.cpp:390
+msgid ""
+"You are running low on disk space on your home partition (currently %1% free), "
+"would you like to run Konqueror to free some disk space and fix the problem?"
+msgstr ""
+
+#: medianotifier.cpp:394
+msgid "Do not ask again"
+msgstr ""
+
+#: notificationdialog.cpp:38
msgid "Medium Detected"
msgstr "检测到了介质"
-#: notificationdialog.cpp:51
+#: notificationdialog.cpp:52
msgid "<b>Medium type:</b>"
msgstr "<b>介质类型:</b>"
-#: notificationdialog.cpp:64
+#: notificationdialog.cpp:65
msgid "Configure..."
msgstr "配置..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po b/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
index 8f432a485c6..96b7358f543 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmaccess\n"
-"POT-Creation-Date: 2006-03-27 03:52+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:12+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po b/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
index 6df250bfd58..221342cbf55 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-09 22:52+0800\n"
"Last-Translator: Dick Zhang <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmarts.po b/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
index a38b833795f..a30dad1573a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-07-28 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-17 11:41+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po b/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
index 97ef8b40556..a93297be444 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:14+0800\n"
"Last-Translator: Dick Zhang <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -137,11 +138,12 @@ msgstr ""
"您没有填写“命令”域。\n"
"这是必须填写的。"
-#: bgdialog.cpp:131
+#: bgdialog.cpp:149
msgid "Open file dialog"
msgstr "打开文件对话框"
-#: bgdialog.cpp:368
+#: bgdialog.cpp:390
+#, fuzzy
msgid ""
"<h1>Background</h1> This module allows you to control the appearance of the "
"virtual desktops. TDE offers a variety of options for customization, including "
@@ -156,8 +158,8 @@ msgid ""
"opaquely, or blended in different ways with the background colors and patterns."
"<p> TDE allows you to have the wallpaper change automatically at specified "
"intervals of time. You can also replace the background with a program that "
-"updates the desktop dynamically. For example, the \"kdeworld\" program shows a "
-"day/night map of the world which is updated periodically."
+"updates the desktop dynamically. For example, the \"kworldclock\" program shows "
+"a day/night map of the world which is updated periodically."
msgstr ""
"<h1>背景</h1> 该模块允许您控制虚拟桌面的外观。TDE 提供许多选项用于定制,包括为每个虚拟桌面指定不同的设置,或者为它们指定一个公共的背景。"
"<p>桌面的外观是由它的背景颜色和图案还有可选的基于图片文件的墙纸组合而成的。"
@@ -165,109 +167,113 @@ msgstr ""
"<p>TDE 允许每隔一定的时间就自动更换墙纸。您还可以用一个能动态更新桌面的程序来替代背景。例如,“TDE "
"世界”程序可以显示一幅不断更新的白天和黑夜的世界地图。"
-#: bgdialog.cpp:424
+#: bgdialog.cpp:449
+msgid "Desktop %1 Viewport %2"
+msgstr ""
+
+#: bgdialog.cpp:456
#, c-format
msgid "Screen %1"
msgstr "第%1个屏幕"
-#: bgdialog.cpp:427
+#: bgdialog.cpp:459
msgid "Single Color"
msgstr "单色"
-#: bgdialog.cpp:428
+#: bgdialog.cpp:460
msgid "Horizontal Gradient"
msgstr "水平渐变"
-#: bgdialog.cpp:429
+#: bgdialog.cpp:461
msgid "Vertical Gradient"
msgstr "垂直渐变"
-#: bgdialog.cpp:430
+#: bgdialog.cpp:462
msgid "Pyramid Gradient"
msgstr "棱锥混和"
-#: bgdialog.cpp:431
+#: bgdialog.cpp:463
msgid "Pipecross Gradient"
msgstr "十字管道渐变"
-#: bgdialog.cpp:432
+#: bgdialog.cpp:464
msgid "Elliptic Gradient"
msgstr "椭圆渐变"
-#: bgdialog.cpp:447
+#: bgdialog.cpp:479
msgid "Centered"
msgstr "居中"
-#: bgdialog.cpp:448
+#: bgdialog.cpp:480
msgid "Tiled"
msgstr "平铺"
-#: bgdialog.cpp:449
+#: bgdialog.cpp:481
msgid "Center Tiled"
msgstr "居中平铺"
-#: bgdialog.cpp:450
+#: bgdialog.cpp:482
msgid "Centered Maxpect"
msgstr "居中放大"
-#: bgdialog.cpp:451
+#: bgdialog.cpp:483
msgid "Tiled Maxpect"
msgstr "平铺放大"
-#: bgdialog.cpp:452
+#: bgdialog.cpp:484
msgid "Scaled"
msgstr "缩放"
-#: bgdialog.cpp:453
+#: bgdialog.cpp:485
msgid "Centered Auto Fit"
msgstr "居中自动调整"
-#: bgdialog.cpp:454
+#: bgdialog.cpp:486
msgid "Scale & Crop"
msgstr "缩放和裁剪"
-#: bgdialog.cpp:457
+#: bgdialog.cpp:489
msgid "No Blending"
msgstr "不混和"
-#: bgdialog.cpp:458
+#: bgdialog.cpp:490
msgid "Flat"
msgstr "平面"
-#: bgdialog.cpp:461
+#: bgdialog.cpp:493
msgid "Pyramid"
msgstr "棱锥"
-#: bgdialog.cpp:462
+#: bgdialog.cpp:494
msgid "Pipecross"
msgstr "十字管道"
-#: bgdialog.cpp:463
+#: bgdialog.cpp:495
msgid "Elliptic"
msgstr "椭圆"
-#: bgdialog.cpp:464
+#: bgdialog.cpp:496
msgid "Intensity"
msgstr "亮度"
-#: bgdialog.cpp:465
+#: bgdialog.cpp:497
msgid "Saturation"
msgstr "饱和度"
-#: bgdialog.cpp:466
+#: bgdialog.cpp:498
msgid "Contrast"
msgstr "对比度"
-#: bgdialog.cpp:467
+#: bgdialog.cpp:499
msgid "Hue Shift"
msgstr "色调偏移"
-#: bgdialog.cpp:616
+#: bgdialog.cpp:656
msgid "Select Wallpaper"
msgstr "选择壁纸"
#. i18n: file bgdialog_ui.ui line 300
-#: bgdialog.cpp:1218 rc.cpp:152
+#: bgdialog.cpp:1260 rc.cpp:152
#, no-c-format
msgid "Get New Wallpapers"
msgstr "获得新壁纸"
@@ -295,8 +301,8 @@ msgid "TDE Background Control Module"
msgstr "TDE 背景控制模块"
#: main.cpp:73
-msgid "(c) 1997-2002 Martin R. Jones"
-msgstr "(C) 1997-2002 Martin R. Jones"
+msgid "(c) 2009,2010 Timothy Pearson"
+msgstr ""
#. i18n: file bgadvanced_ui.ui line 27
#: rc.cpp:3
@@ -305,7 +311,7 @@ msgid "Background Program"
msgstr "背景程序"
#. i18n: file bgadvanced_ui.ui line 44
-#: rc.cpp:6 rc.cpp:245
+#: rc.cpp:6 rc.cpp:251
#, no-c-format
msgid "&Add..."
msgstr "添加(&A)..."
@@ -642,7 +648,7 @@ msgid "Posi&tion:"
msgstr "位置(&T):"
#. i18n: file bgdialog_ui.ui line 376
-#: rc.cpp:164 rc.cpp:206
+#: rc.cpp:164 rc.cpp:212
#, no-c-format
msgid ""
"<qt>You can choose here how a background picture is shown on the desktop:\n"
@@ -680,98 +686,110 @@ msgstr ""
#. i18n: file bgdialog_ui.ui line 384
#: rc.cpp:176
#, no-c-format
+msgid "Cross-fading background"
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 387
+#: rc.cpp:179
+#, no-c-format
+msgid "Enables a smooth fading effect when changing background image."
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 395
+#: rc.cpp:182
+#, no-c-format
msgid ""
"If you have selected to use a background picture you can choose various methods "
"of blending the background colors with the picture. The default option of \"No "
"Blending\" means that the picture simply obscures the background colors below."
msgstr "如果您选择了使用背景图,您可以选择不同地方法混合背景图和背景色。默认选项“无混合”意味着图片简单的遮住下面的背景色。"
-#. i18n: file bgdialog_ui.ui line 403
-#: rc.cpp:179
+#. i18n: file bgdialog_ui.ui line 414
+#: rc.cpp:185
#, no-c-format
msgid "Click to choose the primary background color."
msgstr "点击选择主要的背景色。"
-#. i18n: file bgdialog_ui.ui line 414
-#: rc.cpp:182
+#. i18n: file bgdialog_ui.ui line 425
+#: rc.cpp:188
#, no-c-format
msgid ""
"Click to choose the secondary background color. If no secondary color is "
"required by the pattern selected this button will be disabled."
msgstr "点击选择第二种背景色。如果图案不需要第二种背景色,此按钮将被禁用。"
-#. i18n: file bgdialog_ui.ui line 424
-#: rc.cpp:185
+#. i18n: file bgdialog_ui.ui line 435
+#: rc.cpp:191
#, no-c-format
msgid "Co&lors:"
msgstr "颜色(&L):"
-#. i18n: file bgdialog_ui.ui line 435
-#: rc.cpp:188
+#. i18n: file bgdialog_ui.ui line 446
+#: rc.cpp:194
#, no-c-format
msgid "&Blending:"
msgstr "混和(&B):"
-#. i18n: file bgdialog_ui.ui line 454
-#: rc.cpp:191
+#. i18n: file bgdialog_ui.ui line 465
+#: rc.cpp:197
#, no-c-format
msgid "Balance:"
msgstr "平衡:"
-#. i18n: file bgdialog_ui.ui line 460
-#: rc.cpp:194 rc.cpp:197
+#. i18n: file bgdialog_ui.ui line 471
+#: rc.cpp:200 rc.cpp:203
#, no-c-format
msgid ""
"You can use this slider to control the degree of blending. You can experiment "
"by moving the slider and looking at the effects in the preview image."
msgstr "您可以通过这个滑块来控制混和度。您可以移动滑块并在上面的预览图像中观察它的效果。"
-#. i18n: file bgdialog_ui.ui line 496
-#: rc.cpp:200
+#. i18n: file bgdialog_ui.ui line 507
+#: rc.cpp:206
#, no-c-format
msgid "Reverse roles"
msgstr "反转"
-#. i18n: file bgdialog_ui.ui line 499
-#: rc.cpp:203
+#. i18n: file bgdialog_ui.ui line 510
+#: rc.cpp:209
#, no-c-format
msgid ""
"For some types of blending, you can reverse the role of the background and the "
"picture by checking this option."
msgstr "对于某些类型的背景混合,您可以选中这个选项使背景跟墙纸的层次对调。"
-#. i18n: file bgdialog_ui.ui line 573
-#: rc.cpp:218
+#. i18n: file bgdialog_ui.ui line 584
+#: rc.cpp:224
#, no-c-format
msgid "Background"
msgstr "背景"
-#. i18n: file bgdialog_ui.ui line 584
-#: rc.cpp:221
+#. i18n: file bgdialog_ui.ui line 595
+#: rc.cpp:227
#, no-c-format
msgid "&No picture"
msgstr "没有图片(&N)"
-#. i18n: file bgdialog_ui.ui line 592
-#: rc.cpp:224
+#. i18n: file bgdialog_ui.ui line 603
+#: rc.cpp:230
#, no-c-format
msgid "&Slide show:"
msgstr "放映幻灯片(&S):"
-#. i18n: file bgdialog_ui.ui line 600
-#: rc.cpp:227
+#. i18n: file bgdialog_ui.ui line 611
+#: rc.cpp:233
#, no-c-format
msgid "&Picture:"
msgstr "图片(&P):"
-#. i18n: file bgdialog_ui.ui line 628
-#: rc.cpp:230
+#. i18n: file bgdialog_ui.ui line 639
+#: rc.cpp:236
#, no-c-format
msgid "Set&up..."
msgstr "设置(&U)..."
-#. i18n: file bgdialog_ui.ui line 631
-#: rc.cpp:233
+#. i18n: file bgdialog_ui.ui line 642
+#: rc.cpp:239
#, no-c-format
msgid ""
"Click this button to select a set of images to be used as background pictures. "
@@ -781,35 +799,38 @@ msgid ""
msgstr "单击此按钮选择一组图片作为背景图。一张图片将显示指定的一段时间,然后显示另一张。图片可以随机显示或者用您指定的顺序显示。"
#. i18n: file bgwallpaper_ui.ui line 27
-#: rc.cpp:236
+#: rc.cpp:242
#, no-c-format
msgid "Show the following pictures:"
msgstr "显示下列图片:"
#. i18n: file bgwallpaper_ui.ui line 35
-#: rc.cpp:239
+#: rc.cpp:245
#, no-c-format
msgid "&Show pictures in random order"
msgstr "随机显示图片(&S)"
#. i18n: file bgwallpaper_ui.ui line 51
-#: rc.cpp:242
+#: rc.cpp:248
#, no-c-format
msgid "Change &picture after:"
msgstr "在何时之后更换图片(&P):"
#. i18n: file bgwallpaper_ui.ui line 146
-#: rc.cpp:251
+#: rc.cpp:257
#, no-c-format
msgid "Move &Down"
msgstr "下移(&D)"
#. i18n: file bgwallpaper_ui.ui line 154
-#: rc.cpp:254
+#: rc.cpp:260
#, no-c-format
msgid "Move &Up"
msgstr "上移(&U)"
+#~ msgid "(c) 1997-2002 Martin R. Jones"
+#~ msgstr "(C) 1997-2002 Martin R. Jones"
+
#~ msgid "No picture, color only"
#~ msgstr "没有图片,只使用颜色"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmbell.po b/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
index 49ee28c34e2..721c043fb9a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmbell\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-09-10 20:40+0800\n"
"Last-Translator: Wang Jian <larkw@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po b/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
index c2b910e79ce..2b5a1eb00f7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmcgi\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-27 23:31+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po b/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
index 702030a2740..783d93ee406 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmcolors\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-14 18:35+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,12 @@ msgid ""
msgstr "i18n-translation@lists.linux.net.cn"
#: colorscm.cpp:100
+#, fuzzy
msgid ""
"<h1>Colors</h1> This module allows you to choose the color scheme used for the "
-"TDE desktop. The different elements of the desktop, such as title bars, menu "
-"text, etc., are called \"widgets\". You can choose the widget whose color you "
-"want to change by selecting it from a list, or by clicking on a graphical "
+"Trinity desktop. The different elements of the desktop, such as title bars, "
+"menu text, etc., are called \"widgets\". You can choose the widget whose color "
+"you want to change by selecting it from a list, or by clicking on a graphical "
"representation of the desktop."
"<p> You can save color settings as complete color schemes, which can also be "
"modified or deleted. TDE comes with several predefined color schemes on which "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
index 9ea3d9c42a9..bb298437bfb 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-16 11:49+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po b/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
index 80612057bdc..03a80e2e4b0 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmcrypto\n"
-"POT-Creation-Date: 2007-07-30 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:34+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -196,7 +197,7 @@ msgstr "使用 EGD"
msgid "Use entropy file"
msgstr "使用熵文件"
-#: crypto.cpp:418 crypto.cpp:2278
+#: crypto.cpp:418 crypto.cpp:2298
msgid "Path to EGD:"
msgstr "EGD 路径:"
@@ -512,14 +513,14 @@ msgid ""
msgstr "此模块未与 OpenSSL 库连接,因此无法配置这些选项。"
#: certexport.cpp:93 certexport.cpp:108 certexport.cpp:116 crypto.cpp:832
-#: crypto.cpp:1039 crypto.cpp:1341 crypto.cpp:1370 crypto.cpp:1387
-#: crypto.cpp:1389 crypto.cpp:1572 crypto.cpp:1590 crypto.cpp:1642
-#: crypto.cpp:1674 crypto.cpp:1676 crypto.cpp:1870 crypto.cpp:1890
-#: crypto.cpp:1956 crypto.cpp:1963 crypto.cpp:1978 crypto.cpp:2030
+#: crypto.cpp:1047 crypto.cpp:1361 crypto.cpp:1390 crypto.cpp:1407
+#: crypto.cpp:1409 crypto.cpp:1592 crypto.cpp:1610 crypto.cpp:1662
+#: crypto.cpp:1694 crypto.cpp:1696 crypto.cpp:1890 crypto.cpp:1910
+#: crypto.cpp:1976 crypto.cpp:1983 crypto.cpp:1998 crypto.cpp:2050
msgid "SSL"
msgstr "SSL"
-#: crypto.cpp:834 crypto.cpp:2258 crypto.cpp:2266 crypto.cpp:2270
+#: crypto.cpp:834 crypto.cpp:2278 crypto.cpp:2286 crypto.cpp:2290
msgid "OpenSSL"
msgstr "OpenSSL"
@@ -543,117 +544,117 @@ msgstr "SSL 签名者"
msgid "Validation Options"
msgstr "验证选项"
-#: crypto.cpp:1035
+#: crypto.cpp:1043
msgid ""
"If you do not select at least one SSL algorithm, either SSL will not work or "
"the application may be forced to choose a suitable default."
msgstr "如果您没有选择至少一个 SSL 算法,要么 SSL 不工作,要么应用程序被强迫选择一个适合的默认值。"
-#: crypto.cpp:1087
+#: crypto.cpp:1099
msgid "If you do not select at least one cipher, SSLv2 will not work."
msgstr "如果您没有至少选择一个加密算法,SSL 版本2将不工作。"
-#: crypto.cpp:1089
+#: crypto.cpp:1101
msgid "SSLv2 Ciphers"
msgstr "SSL 版本2加密算法"
-#: crypto.cpp:1106
+#: crypto.cpp:1118
msgid "If you do not select at least one cipher, SSLv3 will not work."
msgstr "如果您没有选择至少一个加密算法,SSL 版本3将不工作。"
-#: crypto.cpp:1108
+#: crypto.cpp:1120
msgid "SSLv3 Ciphers"
msgstr "SSL 版本3加密算法"
-#: crypto.cpp:1340
+#: crypto.cpp:1360
msgid "Could not open the certificate."
msgstr "无法打开证书。"
-#: crypto.cpp:1370
+#: crypto.cpp:1390
msgid "Error obtaining the certificate."
msgstr "获取证书时发生错误。"
-#: crypto.cpp:1387 crypto.cpp:1674
+#: crypto.cpp:1407 crypto.cpp:1694
msgid "This certificate passed the verification tests successfully."
msgstr "该证书通过了校验测试。"
-#: crypto.cpp:1389 crypto.cpp:1676
+#: crypto.cpp:1409 crypto.cpp:1696
msgid "This certificate has failed the tests and should be considered invalid."
msgstr "该证书没有通过校验测试,应该被认为无效。"
-#: crypto.cpp:1566
+#: crypto.cpp:1586
msgid "Certificate password"
msgstr "证书口令"
-#: crypto.cpp:1572
+#: crypto.cpp:1592
msgid "The certificate file could not be loaded. Try a different password?"
msgstr "无法载入证书文件。要尝试另外的口令吗?"
-#: crypto.cpp:1572
+#: crypto.cpp:1592
msgid "Try"
msgstr "尝试"
-#: crypto.cpp:1572
+#: crypto.cpp:1592
msgid "Do Not Try"
msgstr "不尝试"
-#: crypto.cpp:1590
+#: crypto.cpp:1610
msgid ""
"A certificate with that name already exists. Are you sure that you wish to "
"replace it?"
msgstr "同名的证书已存在。您确认要替代它吗?"
-#: crypto.cpp:1623 crypto.cpp:1655 crypto.cpp:1703
+#: crypto.cpp:1643 crypto.cpp:1675 crypto.cpp:1723
msgid "Enter the certificate password:"
msgstr "输入证书口令:"
-#: crypto.cpp:1629 crypto.cpp:1661 crypto.cpp:1709 crypto.cpp:1807
+#: crypto.cpp:1649 crypto.cpp:1681 crypto.cpp:1729 crypto.cpp:1827
msgid "Decoding failed. Please try again:"
msgstr "解码失败。请重试:"
-#: crypto.cpp:1642
+#: crypto.cpp:1662
msgid "Export failed."
msgstr "导出错误。"
-#: crypto.cpp:1802
+#: crypto.cpp:1822
msgid "Enter the OLD password for the certificate:"
msgstr "输入证书的旧口令:"
-#: crypto.cpp:1815
+#: crypto.cpp:1835
msgid "Enter the new certificate password"
msgstr "输入新的证书口令"
-#: crypto.cpp:1867 crypto.cpp:1962
+#: crypto.cpp:1887 crypto.cpp:1982
msgid "This is not a signer certificate."
msgstr "这不是一个签名证书。"
-#: crypto.cpp:1887 crypto.cpp:1977
+#: crypto.cpp:1907 crypto.cpp:1997
msgid "You already have this signer certificate installed."
msgstr "您已经安装了这个签名证书。"
-#: crypto.cpp:1955
+#: crypto.cpp:1975
msgid "The certificate file could not be loaded."
msgstr "无法载入证书文件。"
-#: crypto.cpp:2006
+#: crypto.cpp:2026
msgid "Do you want to make this certificate available to KMail as well?"
msgstr "您是否想要为 KMail 启用此证书?"
-#: crypto.cpp:2006
+#: crypto.cpp:2026
msgid "Make Available"
msgstr "启用"
-#: crypto.cpp:2006
+#: crypto.cpp:2026
msgid "Do Not Make Available"
msgstr "不启用"
-#: crypto.cpp:2012
+#: crypto.cpp:2032
msgid ""
"Could not execute Kleopatra. You might have to install or update the tdepim "
"package."
msgstr "无法执行 Kleopatra。您可能需要安装或更新 tdepim 软件包。"
-#: crypto.cpp:2030
+#: crypto.cpp:2050
msgid ""
"This will revert your certificate signers database to the TDE default.\n"
"This operation cannot be undone.\n"
@@ -663,81 +664,81 @@ msgstr ""
"这个操作不能取消。\n"
"您确定要继续吗?"
-#: crypto.cpp:2030
+#: crypto.cpp:2050
msgid "Revert"
msgstr "复原"
-#: crypto.cpp:2256 crypto.cpp:2264
+#: crypto.cpp:2276 crypto.cpp:2284
msgid "Failed to load OpenSSL."
msgstr "无法载入 OpenSSL。"
-#: crypto.cpp:2257
+#: crypto.cpp:2277
msgid "libssl was not found or successfully loaded."
msgstr "没有找到 libssl 或成功载入。"
-#: crypto.cpp:2265
+#: crypto.cpp:2285
msgid "libcrypto was not found or successfully loaded."
msgstr "没有找到 libcrypto 或成功载入。"
-#: crypto.cpp:2270
+#: crypto.cpp:2290
msgid "OpenSSL was successfully loaded."
msgstr "成功载入 OpenSSL。"
-#: crypto.cpp:2289
+#: crypto.cpp:2309
msgid "Path to entropy file:"
msgstr "熵文件路径:"
-#: crypto.cpp:2302
+#: crypto.cpp:2322
msgid "Personal SSL"
msgstr "个人 SSL"
-#: crypto.cpp:2303
+#: crypto.cpp:2323
msgid "Server SSL"
msgstr "服务器 SSL"
-#: crypto.cpp:2304
+#: crypto.cpp:2324
msgid "S/MIME"
msgstr "S/MIME"
-#: crypto.cpp:2305
+#: crypto.cpp:2325
msgid "PGP"
msgstr "PGP"
-#: crypto.cpp:2306
+#: crypto.cpp:2326
msgid "GPG"
msgstr "GPG"
-#: crypto.cpp:2307
+#: crypto.cpp:2327
msgid "SSL Personal Request"
msgstr "SSL 个人请求"
-#: crypto.cpp:2308
+#: crypto.cpp:2328
msgid "SSL Server Request"
msgstr "SSL 服务器请求"
-#: crypto.cpp:2309
+#: crypto.cpp:2329
msgid "Netscape SSL"
msgstr "Netscape SSL"
-#: crypto.cpp:2310
+#: crypto.cpp:2330
msgid ""
"_: Server certificate authority\n"
"Server CA"
msgstr "服务器 CA"
-#: crypto.cpp:2311
+#: crypto.cpp:2331
msgid ""
"_: Personal certificate authority\n"
"Personal CA"
msgstr "个人 CA"
-#: crypto.cpp:2312
+#: crypto.cpp:2332
msgid ""
"_: Secure MIME certificate authority\n"
"S/MIME CA"
msgstr "S/MIME CA"
-#: crypto.cpp:2404
+#: crypto.cpp:2435
msgid "None"
msgstr "无"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcss.po b/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
index cad6d425f7e..ed2437ccbe6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmcss\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-27 23:45+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
index 41c09c9c57f..2d577f3cff1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
@@ -5,16 +5,17 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:19+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
-#: energy.cpp:145
+#: energy.cpp:149
msgid ""
"<h1>Display Power Control</h1> If your display supports power saving features, "
"you can configure them using this module."
@@ -29,58 +30,71 @@ msgstr ""
"<p>共有三级节能:待机、休眠以及关闭电源。节能的级别越高,其恢复到正常工作状态所需的时间就越长。"
"<p>要把显示器从节能状态唤醒,您可以轻轻挪动鼠标,或者按下一个不致产生副作用的键,如“Shift”键。"
-#: energy.cpp:165
+#: energy.cpp:185
msgid "&Enable display power management"
msgstr "启用显示器能源管理(&E)"
-#: energy.cpp:168
+#: energy.cpp:189
msgid "Check this option to enable the power saving features of your display."
msgstr "选中此选项将启用您的显示器的节能功能。"
-#: energy.cpp:171
+#: energy.cpp:193
+#, fuzzy
+msgid "&Enable specific display power management"
+msgstr "启用显示器能源管理(&E)"
+
+#: energy.cpp:199
msgid "Your display does not support power saving."
msgstr "您的显示器没有节能功能。"
-#: energy.cpp:178
+#: energy.cpp:206
msgid "Learn more about the Energy Star program"
msgstr "更多地了解关于能源之星程序"
-#: energy.cpp:187
+#: energy.cpp:216
msgid "&Standby after:"
msgstr "待机前等(&S):"
-#: energy.cpp:189 energy.cpp:200 energy.cpp:212
+#: energy.cpp:218 energy.cpp:229 energy.cpp:241
msgid " min"
msgstr "分钟"
-#: energy.cpp:190 energy.cpp:201 energy.cpp:213
+#: energy.cpp:219 energy.cpp:230 energy.cpp:242
msgid "Disabled"
msgstr "禁用"
-#: energy.cpp:193
+#: energy.cpp:222
msgid ""
"Choose the period of inactivity after which the display should enter "
"\"standby\" mode. This is the first level of power saving."
msgstr "选择显示器进入“待机”模式前的空闲状态的时间。这是第一级节能。"
-#: energy.cpp:198
+#: energy.cpp:227
msgid "S&uspend after:"
msgstr "休眠(&U):"
-#: energy.cpp:204
+#: energy.cpp:233
msgid ""
"Choose the period of inactivity after which the display should enter "
"\"suspend\" mode. This is the second level of power saving, but may not be "
"different from the first level for some displays."
msgstr "选择显示器进入“休眠”模式前的空闲状态的时间。这是第二级节能,但是对于某些显示器来说,可能和第一级没有什么区别。"
-#: energy.cpp:210
+#: energy.cpp:239
msgid "&Power off after:"
msgstr "关闭电源(&P):"
-#: energy.cpp:216
+#: energy.cpp:245
msgid ""
"Choose the period of inactivity after which the display should be powered off. "
"This is the greatest level of power saving that can be achieved while the "
"display is still physically turned on."
msgstr "选择关闭显示器电源前的空闲状态的时间。这是显示器物理上处于开启状态时所能达到的最大级别的节能。"
+
+#: energy.cpp:256
+msgid "Configure KPowersave..."
+msgstr ""
+
+#: energy.cpp:262
+msgid "Configure TDEPowersave..."
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po b/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
index 9983e282d26..d22e6b508ef 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmfonts\n"
-"POT-Creation-Date: 2007-04-11 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-09 15:52+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po b/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
index a5fd1e482ba..7154eb56ee9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmhtmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:17+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmicons.po b/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
index e63985fbab9..9e344e0306b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmicons\n"
-"POT-Creation-Date: 2006-09-03 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:50+0800\n"
"Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,115 +27,134 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: icons.cpp:45
+#: icons.cpp:48
msgid "Use of Icon"
msgstr "图标用途"
-#: icons.cpp:66
+#: icons.cpp:69
msgid "Active"
msgstr "活动"
-#: icons.cpp:68
+#: icons.cpp:71
msgid "Disabled"
msgstr "禁用"
-#: icons.cpp:80
+#: icons.cpp:82
msgid "Size:"
msgstr "大小:"
-#: icons.cpp:88
+#: icons.cpp:90
msgid "Double-sized pixels"
msgstr "使用双倍像素显示"
-#: icons.cpp:92
+#: icons.cpp:94
msgid "Animate icons"
msgstr "动画图标"
-#: icons.cpp:117
+#: icons.cpp:98
+msgid "Rounded text selection"
+msgstr ""
+
+#: icons.cpp:102
+msgid "Show icon activation effect"
+msgstr ""
+
+#: icons.cpp:131
msgid "Set Effect..."
msgstr "设置特殊效果..."
-#: icons.cpp:133
+#: icons.cpp:147
msgid "Desktop/File Manager"
msgstr "桌面/文件管理器"
-#: icons.cpp:134
+#: icons.cpp:148
msgid "Toolbar"
msgstr "工具栏"
-#: icons.cpp:136
+#: icons.cpp:150
msgid "Small Icons"
msgstr "小图标"
-#: icons.cpp:137
+#: icons.cpp:151
msgid "Panel"
msgstr "面板"
-#: icons.cpp:138
+#: icons.cpp:152
msgid "All Icons"
msgstr "全部图标"
-#: icons.cpp:445
+#: icons.cpp:153 icons.cpp:303 icons.cpp:364 icons.cpp:375 icons.cpp:518
+#: icons.cpp:561 icons.cpp:612
+msgid "Panel Buttons"
+msgstr ""
+
+#: icons.cpp:154 icons.cpp:317 icons.cpp:367 icons.cpp:378 icons.cpp:526
+#: icons.cpp:564 icons.cpp:617
+#, fuzzy
+msgid "System Tray Icons"
+msgstr "小图标"
+
+#: icons.cpp:579
msgid "Setup Default Icon Effect"
msgstr "设置默认图标效果"
-#: icons.cpp:446
+#: icons.cpp:580
msgid "Setup Active Icon Effect"
msgstr "设置活动图标效果"
-#: icons.cpp:447
+#: icons.cpp:581
msgid "Setup Disabled Icon Effect"
msgstr "设置禁用图标效果"
-#: icons.cpp:534
+#: icons.cpp:690
msgid "&Effect:"
msgstr "特殊效果(&E):"
-#: icons.cpp:538
+#: icons.cpp:694
msgid "No Effect"
msgstr "无特殊效果"
-#: icons.cpp:539
+#: icons.cpp:695
msgid "To Gray"
msgstr "变灰色"
-#: icons.cpp:540
+#: icons.cpp:696
msgid "Colorize"
msgstr "加彩色"
-#: icons.cpp:541
+#: icons.cpp:697
msgid "Gamma"
msgstr "亮度"
-#: icons.cpp:542
+#: icons.cpp:698
msgid "Desaturate"
msgstr "去饱和"
-#: icons.cpp:543
+#: icons.cpp:699
msgid "To Monochrome"
msgstr "变为单色"
-#: icons.cpp:549
+#: icons.cpp:705
msgid "&Semi-transparent"
msgstr "半透明(&S)"
-#: icons.cpp:553
+#: icons.cpp:709
msgid "Preview"
msgstr "预览"
-#: icons.cpp:564
+#: icons.cpp:720
msgid "Effect Parameters"
msgstr "效果参数"
-#: icons.cpp:569
+#: icons.cpp:725
msgid "&Amount:"
msgstr "程度(&A):"
-#: icons.cpp:576
+#: icons.cpp:732
msgid "Co&lor:"
msgstr "颜色(&L):"
-#: icons.cpp:584
+#: icons.cpp:740
msgid "&Second color:"
msgstr "第二颜色(&S):"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcminfo.po b/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
index 68cd4cd1755..e094b9fe23b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcminfo\n"
-"POT-Creation-Date: 2006-06-16 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-07-22 12:22+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -150,7 +151,7 @@ msgstr "%1 字节"
#: info.cpp:263 info_aix.cpp:299 info_hpux.cpp:372 info_hpux.cpp:662
#: info_linux.cpp:136 info_linux.cpp:562 info_netbsd.cpp:73
-#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:636
+#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:635
msgid "Value"
msgstr "值"
@@ -158,7 +159,7 @@ msgstr "值"
msgid "Server Information"
msgstr "服务器信息"
-#: info.cpp:272 opengl.cpp:638
+#: info.cpp:272 opengl.cpp:637
msgid "Name of the Display"
msgstr "显示器名称"
@@ -873,11 +874,13 @@ msgid "Disk cache:"
msgstr "磁盘缓存:"
#: memory.cpp:156
-msgid "Total swap memory:"
+#, fuzzy
+msgid "Total swap space:"
msgstr "交换区总量:"
#: memory.cpp:159
-msgid "Free swap memory:"
+#, fuzzy
+msgid "Free swap space:"
msgstr "空闲交换区:"
#: memory.cpp:198
@@ -885,9 +888,10 @@ msgid "Total Memory"
msgstr "内存总量"
#: memory.cpp:199
+#, fuzzy
msgid ""
-"This graph gives you an overview of the <b>total sum of physical and virtual "
-"memory</b> in your system."
+"This graph gives you an overview of the usage of <b>all available memory</b> "
+"(the sum of physical memory and swap space) in your system."
msgstr "此图向您概述了系统<b>物理内存和虚拟内存的总量</b>。"
#: memory.cpp:204
@@ -895,74 +899,83 @@ msgid "Physical Memory"
msgstr "物理内存"
#: memory.cpp:205
+#, fuzzy
msgid ""
-"This graph gives you an overview of the <b>usage of physical memory</b> "
+"This graph gives you an overview of the usage of <b>physical memory</b> "
"in your system."
"<p>Most operating systems (including Linux) will use as much of the available "
-"physical memory as possible as disk cache, to speed up the system performance. "
-"<p>This means that if you have a small amount of <b>Free Physical Memory</b> "
-"and a large amount of <b>Disk Cache Memory</b>, your system is well configured."
+"physical memory as possible for a disk cache, to speed up the reading and "
+"writing of files. "
+"<p>This means that if you are seeing a small amount of <b>"
+"Free Physical Memory</b> and a large amount of <b>Disk Cache</b>"
+", your system is well configured."
msgstr ""
"此图向您概述了系统中<b>物理内存的使用情况</b>。"
"<p>大多数操作系统(包括 Linux)都会尽可能使用物理内存来进行磁盘缓存,这样可以提升系统性能。"
"<p>这意味着,如果您<b>剩余物理内存</b>的值偏小,而<b>磁盘缓存内存</b>较大的话,您的系统配置就是比较合理的。"
-#: memory.cpp:217
+#: memory.cpp:216
msgid "Swap Space"
msgstr "交换空间"
-#: memory.cpp:218
+#: memory.cpp:217
+#, fuzzy
msgid ""
-"The swap space is the <b>virtual memory</b> available to the system. "
-"<p>It will be used on demand and is provided through one or more swap "
+"Swap space is the <b>virtual memory</b> available to the system. "
+"<p>It will be used when needed, and is provided through one or more swap "
"partitions and/or swap files."
msgstr "交换空间是系统可用的<b>虚拟内存</b>。<p>这片空间由一个或多个交换分区和/或交换文件组成。系统将会按需使用这片空间。"
-#: memory.cpp:271
+#: memory.cpp:270
msgid ""
"<h1>Memory Information</h1> This display shows you the current memory usage of "
"your system. The values are updated on a regular basis and give you an overview "
"of the physical and virtual used memory."
msgstr "<h1>内存信息</h1> 显示您当前系统使用内存的信息。显示的值定期更新,您可以大概了解物理内存和实际使用的内存。"
-#: memory.cpp:350
+#: memory.cpp:349
msgid "%1 free"
msgstr "%1 空闲"
-#: memory.cpp:371
+#: memory.cpp:370
msgid "%1 bytes ="
msgstr "%1 字节 ="
-#: memory.cpp:402
+#: memory.cpp:401
msgid "Application Data"
msgstr "应用程序数据"
-#: memory.cpp:404
+#: memory.cpp:403
msgid "Disk Buffers"
msgstr "磁盘缓冲"
-#: memory.cpp:406
+#: memory.cpp:405
msgid "Disk Cache"
msgstr "磁盘缓存"
-#: memory.cpp:408
+#: memory.cpp:407
msgid "Free Physical Memory"
msgstr "空闲物理内存"
-#: memory.cpp:419 memory.cpp:439
+#: memory.cpp:418
msgid "Used Swap"
msgstr "已用交换区"
-#: memory.cpp:421
+#: memory.cpp:420
msgid "Free Swap"
msgstr "空闲交换区"
-#: memory.cpp:437
-msgid "Used Physical Memory"
-msgstr "已用物理内存"
+#: memory.cpp:432
+msgid "Used Memory (swap part)"
+msgstr ""
+
+#: memory.cpp:434
+msgid "Used Memory (physical part)"
+msgstr ""
-#: memory.cpp:441
-msgid "Total Free Memory"
+#: memory.cpp:436
+#, fuzzy
+msgid "Free Memory (total)"
msgstr "空闲内存总量"
#: opengl.cpp:266
@@ -1161,6 +1174,9 @@ msgstr "GLU 版本"
msgid "GLU extensions"
msgstr "GLU 扩展"
-#: opengl.cpp:662
+#: opengl.cpp:661
msgid "Could not initialize OpenGL"
msgstr "无法初始化 OpenGL"
+
+#~ msgid "Used Physical Memory"
+#~ msgstr "已用物理内存"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcminput.po b/tde-i18n-zh_CN/messages/tdebase/kcminput.po
index cf8eb3bd025..a359235963a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcminput.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcminput.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-02-12 18:29+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,98 +34,98 @@ msgstr "i18n-translation@lists.linux.net.cn"
msgid "Mouse type: %1"
msgstr "鼠标类型:%1"
-#: logitechmouse.cpp:225
+#: logitechmouse.cpp:229
msgid ""
"RF channel 1 has been set. Please press Connect button on mouse to re-establish "
"link"
msgstr "设置了 RF 第一频道。请按连接鼠标上的连接按钮以便重新建立连接"
-#: logitechmouse.cpp:225 logitechmouse.cpp:229
+#: logitechmouse.cpp:229 logitechmouse.cpp:233
msgid "Press Connect Button"
msgstr "请按连接按钮"
-#: logitechmouse.cpp:229
+#: logitechmouse.cpp:233
msgid ""
"RF channel 2 has been set. Please press Connect button on mouse to re-establish "
"link"
msgstr "设置了 RF 第二频道。请按连接鼠标上的连接按钮以便重新建立连接"
-#: logitechmouse.cpp:356
+#: logitechmouse.cpp:370
msgid "none"
msgstr "无"
-#: logitechmouse.cpp:359 logitechmouse.cpp:389
+#: logitechmouse.cpp:373 logitechmouse.cpp:403
msgid "Cordless Mouse"
msgstr "无限旋貂"
-#: logitechmouse.cpp:362 logitechmouse.cpp:368 logitechmouse.cpp:371
+#: logitechmouse.cpp:376 logitechmouse.cpp:382 logitechmouse.cpp:385
msgid "Cordless Wheel Mouse"
msgstr "带滚轮的无限旋貂"
-#: logitechmouse.cpp:365
+#: logitechmouse.cpp:379
msgid "Cordless MouseMan Wheel"
msgstr "无限银貂"
-#: logitechmouse.cpp:374
+#: logitechmouse.cpp:388
msgid "Cordless TrackMan Wheel"
msgstr "无限火星"
-#: logitechmouse.cpp:377
+#: logitechmouse.cpp:391
msgid "TrackMan Live"
msgstr "简报飞貂"
-#: logitechmouse.cpp:380
+#: logitechmouse.cpp:394
msgid "Cordless TrackMan FX"
msgstr "无限金星"
-#: logitechmouse.cpp:383
+#: logitechmouse.cpp:397
msgid "Cordless MouseMan Optical"
msgstr "无限飞貂极光版"
-#: logitechmouse.cpp:386
+#: logitechmouse.cpp:400
msgid "Cordless Optical Mouse"
msgstr "无限天貂"
-#: logitechmouse.cpp:392
+#: logitechmouse.cpp:406
msgid "Cordless MouseMan Optical (2ch)"
msgstr "无限飞貂极光版(双频道)"
-#: logitechmouse.cpp:395
+#: logitechmouse.cpp:409
msgid "Cordless Optical Mouse (2ch)"
msgstr "无限天貂(双频道)"
-#: logitechmouse.cpp:398
+#: logitechmouse.cpp:412
msgid "Cordless Mouse (2ch)"
msgstr "无限旋貂(双频道)"
-#: logitechmouse.cpp:401
+#: logitechmouse.cpp:415
msgid "Cordless Optical TrackMan"
msgstr "无限水星"
-#: logitechmouse.cpp:404
+#: logitechmouse.cpp:418
msgid "MX700 Cordless Optical Mouse"
msgstr "无限云貂极光版"
-#: logitechmouse.cpp:407
+#: logitechmouse.cpp:421
msgid "MX700 Cordless Optical Mouse (2ch)"
msgstr "无限云貂极光版(双频道)"
-#: logitechmouse.cpp:410
+#: logitechmouse.cpp:424
msgid "Unknown mouse"
msgstr "未知鼠标"
-#: mouse.cpp:82
+#: mouse.cpp:84
msgid ""
"<h1>Mouse</h1> This module allows you to choose various options for the way in "
"which your pointing device works. Your pointing device may be a mouse, "
"trackball, or some other hardware that performs a similar function."
msgstr "<h1>鼠标</h1>这个模块允许您使用各种选项来选择指点设备工作的方式。您的指点设备可能是鼠标,跟踪球,或其它能够完成相似功能的其它硬件。"
-#: mouse.cpp:101
+#: mouse.cpp:103
msgid "&General"
msgstr "常规(&G)"
-#: mouse.cpp:106
+#: mouse.cpp:108
msgid ""
"If you are left-handed, you may prefer to swap the functions of the left and "
"right buttons on your pointing device by choosing the 'left-handed' option. If "
@@ -135,7 +136,7 @@ msgstr ""
"如果您是左手习惯,您也许希望选择“左手习惯”选项来交换指点设备的左键和右键的功能。如果您的指点设备有多于两个的按钮,只有具有左键或右键功能的按钮才会受到影响。例"
"如,如果您有三键鼠标,中键不受影响。"
-#: mouse.cpp:116
+#: mouse.cpp:118
msgid ""
"The default behavior in TDE is to select and activate icons with a single click "
"of the left button on your pointing device. This behavior is consistent with "
@@ -145,41 +146,41 @@ msgid ""
msgstr ""
"TDE 的默认行为是指点设备的左按钮单击选中并激活图标。这和您在大多数 web 浏览器中单击链接时的行为是一致的。如果您希望单击选中,双击激活,使用这个选项。"
-#: mouse.cpp:124
+#: mouse.cpp:126
msgid "Activates and opens a file or folder with a single click."
msgstr "用单击激活并打开文件或文件夹。"
-#: mouse.cpp:130
+#: mouse.cpp:132
msgid ""
"If you check this option, pausing the mouse pointer over an icon on the screen "
"will automatically select that icon. This may be useful when single clicks "
"activate icons, and you want only to select the icon without activating it."
msgstr "如果您使用这个选项,鼠标指针在屏幕上的图标上停留会自动选中图标。这在单击激活图标,而您只想选择而不是激活图标时是非常有用的。"
-#: mouse.cpp:142
+#: mouse.cpp:144
msgid ""
"If you have checked the option to automatically select icons, this slider "
"allows you to select how long the mouse pointer must be paused over the icon "
"before it is selected."
msgstr "如果您已经使用自动选中图标的选项,这个滑动条允许您指定在图标被选中前鼠标指针必须在图标上停留多长时间。"
-#: mouse.cpp:147
+#: mouse.cpp:149
msgid "Show feedback when clicking an icon"
msgstr "在点击图标时显示反馈"
-#: mouse.cpp:179
+#: mouse.cpp:181
msgid "&Cursor Theme"
msgstr "光标主题(&C)"
-#: mouse.cpp:183
+#: mouse.cpp:185
msgid "Advanced"
msgstr "高级"
-#: mouse.cpp:189
+#: mouse.cpp:191
msgid "Pointer acceleration:"
msgstr "指针加速:"
-#: mouse.cpp:194
+#: mouse.cpp:196
msgid ""
"This option allows you to change the relationship between the distance that the "
"mouse pointer moves on the screen and the relative movement of the physical "
@@ -192,11 +193,11 @@ msgstr ""
"这个选项允许您改变鼠标指针在屏幕上移动和实际的设备(可能是鼠标、跟踪球或其它的指点设备)移动之间的关系。"
"<p>大的加速值将导致即使您的物理设备做很小的移动也会使鼠标指针移动很大距离。选择非常大的值将使鼠标指针在屏幕上掠过,很难控制。"
-#: mouse.cpp:207
+#: mouse.cpp:209
msgid "Pointer threshold:"
msgstr "指针快速移动阈值:"
-#: mouse.cpp:215
+#: mouse.cpp:217
msgid ""
"The threshold is the smallest distance that the mouse pointer must move on the "
"screen before acceleration has any effect. If the movement is smaller than the "
@@ -213,7 +214,7 @@ msgstr ""
msgid "Double click interval:"
msgstr "双击间隔:"
-#: mouse.cpp:231 mouse.cpp:249 mouse.cpp:303 mouse.cpp:311 mouse.cpp:320
+#: mouse.cpp:231 mouse.cpp:279 mouse.cpp:333 mouse.cpp:341 mouse.cpp:350
msgid " msec"
msgstr " 毫秒"
@@ -225,31 +226,46 @@ msgid ""
"separate clicks."
msgstr "双击间隔时间是鼠标双击的两次点击的最大间隔时间(毫秒)。如果第二次点击在第一次点击后的此时间间隔后,这两次点击将被认为是两次单击。"
-#: mouse.cpp:247
+#: mouse.cpp:246
+msgid "Double-click on the image below to test your double-click interval:"
+msgstr ""
+
+#: mouse.cpp:248
+msgid ""
+"The image will change when your double-click test time is less than or equal to "
+"the interval you configured. When changing the interval, be sure to select the "
+"Apply button before testing. For example, the image will not change when you "
+"configure a double-click interval of 700 milliseconds and the time between two "
+"successive clicks on the image is 800 milliseconds, but the image will change "
+"when the time between clicks is 600 milliseconds. The goal is to select a "
+"comfortable interval that you find is not too fast or slow."
+msgstr ""
+
+#: mouse.cpp:277
msgid "Drag start time:"
msgstr "拖动起始时间:"
-#: mouse.cpp:254
+#: mouse.cpp:284
msgid ""
"If you click with the mouse (e.g. in a multi-line editor) and begin to move the "
"mouse within the drag start time, a drag operation will be initiated."
msgstr "如果您用鼠标点击(例如在多行编辑器里)并在拖动起始时间内开始移动鼠标,就开始拖动操作。"
-#: mouse.cpp:260
+#: mouse.cpp:290
msgid "Drag start distance:"
msgstr "拖动起始距离:"
-#: mouse.cpp:268
+#: mouse.cpp:298
msgid ""
"If you click with the mouse and begin to move the mouse at least the drag start "
"distance, a drag operation will be initiated."
msgstr "如果您用鼠标点击并在拖动起始距离内开始移动鼠标,就开始拖动操作。"
-#: mouse.cpp:274
+#: mouse.cpp:304
msgid "Mouse wheel scrolls by:"
msgstr "鼠标滚轮卷动单位:"
-#: mouse.cpp:282
+#: mouse.cpp:312
msgid ""
"If you use the wheel of a mouse, this value determines the number of lines to "
"scroll for each wheel movement. Note that if this number exceeds the number of "
@@ -257,53 +273,53 @@ msgid ""
"page up/down movement."
msgstr "如果您使用滚轮鼠标,该值确定滚轮每次运动要卷动的行数。注意如果该值超过了可见的行数时,该值会被忽略,滚轮动作将被作为一次上页(或下页)动作。"
-#: mouse.cpp:288
+#: mouse.cpp:318
msgid "Mouse Navigation"
msgstr "鼠标导航"
-#: mouse.cpp:296
+#: mouse.cpp:326
msgid "&Move pointer with keyboard (using the num pad)"
msgstr "用键盘(数字键盘)移动鼠标指针(&M)"
-#: mouse.cpp:302
+#: mouse.cpp:332
msgid "&Acceleration delay:"
msgstr "加速延时(&A):"
-#: mouse.cpp:310
+#: mouse.cpp:340
msgid "R&epeat interval:"
msgstr "重复间隔(&E):"
-#: mouse.cpp:318
+#: mouse.cpp:348
msgid "Acceleration &time:"
msgstr "加速时间(&T):"
-#: mouse.cpp:326
+#: mouse.cpp:356
msgid "Ma&ximum speed:"
msgstr "最大速度(&X):"
-#: mouse.cpp:328
+#: mouse.cpp:358
msgid " pixel/sec"
msgstr " 像素/秒"
-#: mouse.cpp:334
+#: mouse.cpp:364
msgid "Acceleration &profile:"
msgstr "加速曲线参数(&P):"
-#: mouse.cpp:407
+#: mouse.cpp:437
msgid "Mouse"
msgstr "鼠标"
-#: mouse.cpp:408
+#: mouse.cpp:438
msgid "(c) 1997 - 2005 Mouse developers"
msgstr "(c) 1997 - 2005 鼠标开发者"
-#: mouse.cpp:710 mouse.cpp:715
+#: mouse.cpp:765 mouse.cpp:770
msgid ""
"_n: pixel\n"
" pixels"
msgstr " 像素"
-#: mouse.cpp:720
+#: mouse.cpp:775
msgid ""
"_n: line\n"
" lines"
@@ -456,19 +472,19 @@ msgstr "第二频道"
msgid "Select the cursor theme you want to use:"
msgstr "选择您想要使用的光标主题:"
-#: core/themepage.cpp:66 xcursor/themepage.cpp:93
+#: core/themepage.cpp:66 xcursor/themepage.cpp:100
msgid "Name"
msgstr "名称"
-#: core/themepage.cpp:67 xcursor/themepage.cpp:94
+#: core/themepage.cpp:67 xcursor/themepage.cpp:101
msgid "Description"
msgstr "描述"
-#: core/themepage.cpp:105 xcursor/themepage.cpp:139
+#: core/themepage.cpp:105 xcursor/themepage.cpp:146
msgid "You have to restart TDE for these changes to take effect."
msgstr "要让这些更改生效,您必须重新启动 TDE。"
-#: core/themepage.cpp:106 xcursor/themepage.cpp:140
+#: core/themepage.cpp:106 xcursor/themepage.cpp:147
msgid "Cursor Settings Changed"
msgstr "光标设置已更改"
@@ -504,74 +520,78 @@ msgstr "大白光标"
msgid "Large white cursors"
msgstr "大白光标"
-#: xcursor/themepage.cpp:84
+#: xcursor/themepage.cpp:79
+msgid "XFree theme %1 - incomplete for TDE"
+msgstr ""
+
+#: xcursor/themepage.cpp:80
+msgid "No description available"
+msgstr "没有可用的描述"
+
+#: xcursor/themepage.cpp:91
msgid "Select the cursor theme you want to use (hover preview to test cursor):"
msgstr "选择您想要使用的鼠标指针主题(指向预览可测试指针):"
-#: xcursor/themepage.cpp:104
+#: xcursor/themepage.cpp:111
msgid "Install New Theme..."
msgstr "安装新主题..."
-#: xcursor/themepage.cpp:105
+#: xcursor/themepage.cpp:112
msgid "Remove Theme"
msgstr "删除主题"
-#: xcursor/themepage.cpp:212
+#: xcursor/themepage.cpp:219
msgid "Drag or Type Theme URL"
msgstr "拖曳或输入主题 URL"
-#: xcursor/themepage.cpp:221
+#: xcursor/themepage.cpp:228
#, c-format
msgid "Unable to find the cursor theme archive %1."
msgstr "找不到光标主题存档 %1。"
-#: xcursor/themepage.cpp:223
+#: xcursor/themepage.cpp:230
msgid ""
"Unable to download the cursor theme archive; please check that the address %1 "
"is correct."
msgstr "无法下载光标主题存档;请检查地址 %1 是否正确。"
-#: xcursor/themepage.cpp:231
+#: xcursor/themepage.cpp:238
msgid "The file %1 does not appear to be a valid cursor theme archive."
msgstr "文件 %1 好像不是有效的光标主题存档。"
-#: xcursor/themepage.cpp:240
+#: xcursor/themepage.cpp:247
msgid ""
"<qt>Are you sure you want to remove the <strong>%1</strong> cursor theme?"
"<br>This will delete all the files installed by this theme.</qt>"
msgstr "<qt>您确定要删除 <strong>%1</strong> 光标主题吗?<br>这将删除此主题安装的全部文件。</qt>"
-#: xcursor/themepage.cpp:246
+#: xcursor/themepage.cpp:253
msgid "Confirmation"
msgstr "确认"
-#: xcursor/themepage.cpp:300
+#: xcursor/themepage.cpp:307
msgid ""
"A theme named %1 already exists in your icon theme folder. Do you want replace "
"it with this one?"
msgstr "已经在您的图标主题文件夹中存在名为 %1 的主题。您是否想要将其覆盖?"
-#: xcursor/themepage.cpp:302
+#: xcursor/themepage.cpp:309
msgid "Overwrite Theme?"
msgstr "覆盖主题吗?"
-#: xcursor/themepage.cpp:336 xcursor/themepage.cpp:483
-msgid "No description available"
-msgstr "没有可用的描述"
-
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
msgid "No theme"
msgstr "无主题"
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
msgid "The old classic X cursors"
msgstr "旧的经典 X 光标"
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
msgid "System theme"
msgstr "系统主题"
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
msgid "Do not change cursor theme"
msgstr "不更改光标主题"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po b/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
index 9348f033b0c..987c0963c2d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkclock\n"
-"POT-Creation-Date: 2005-12-17 03:07+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:16+0800\n"
"Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkded.po b/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
index 6fc2b51094e..57cce00d8d8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkded\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:45+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -38,10 +39,11 @@ msgid "(c) 2002 Daniel Molkentin"
msgstr "(C) 2002 Daniel Molkentin"
#: kcmkded.cpp:59
+#, fuzzy
msgid ""
"<h1>Service Manager</h1>"
-"<p>This module allows you to have an overview of all plugins of the TDE Daemon, "
-"also referred to as TDE Services. Generally, there are two types of service:</p>"
+"<p>This module allows you to have an overview of all plugins running as TDE "
+"Services. Generally, there are two types of service:</p>"
"<ul>"
"<li>Services invoked at startup</li>"
"<li>Services called on demand</li></ul>"
@@ -109,7 +111,8 @@ msgid "Start"
msgstr "启动"
#: kcmkded.cpp:237 kcmkded.cpp:328
-msgid "Unable to contact TDED."
+#, fuzzy
+msgid "Unable to contact KDED."
msgstr "无法联系 TDED。"
#: kcmkded.cpp:322
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
index 38a9ad15bf4..6d1223536ca 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
@@ -8,17 +8,18 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkeys\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:41+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Wang Jian <lark@linux.net.cn>\n"
"X-Generator: KBabel 1.0\n"
-#: shortcuts.cpp:93
+#: shortcuts.cpp:96
msgid ""
"<h1>Key Bindings</h1> Using key bindings you can configure certain actions to "
"be triggered when you press a key or a combination of keys, e.g. Ctrl+C is "
@@ -35,70 +36,74 @@ msgstr ""
"<p>在“全局快捷键”里,您可以配置和程序无关的键盘关联,比如切换桌面或最大化窗口。在“应用程序快捷键”里,您将找到在应用程序里使用的典型绑定,比如“复制”和“"
"粘贴”。"
-#: shortcuts.cpp:152
+#: shortcuts.cpp:157
msgid ""
"Click here to remove the selected key bindings scheme. You cannot remove the "
"standard system-wide schemes 'Current scheme' and 'TDE default'."
msgstr "单击此处删除选中的按键绑定方案。您无法删除标准的系统级方案“当前方案”和“TDE 默认方案”。"
-#: shortcuts.cpp:158
+#: shortcuts.cpp:163
msgid "New scheme"
msgstr "新方案"
-#: shortcuts.cpp:163
+#: shortcuts.cpp:168
msgid "&Save..."
msgstr "保存(&S)..."
-#: shortcuts.cpp:165
+#: shortcuts.cpp:170
msgid ""
"Click here to add a new key bindings scheme. You will be prompted for a name."
msgstr "单击以添加新的按键绑定方案。您会被提示输入名字。"
-#: shortcuts.cpp:177
+#: shortcuts.cpp:195
+msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
+msgstr ""
+
+#: shortcuts.cpp:201
msgid "&Global Shortcuts"
msgstr "全局快捷键(&G)"
-#: shortcuts.cpp:182
+#: shortcuts.cpp:206
msgid "Shortcut Se&quences"
msgstr "快捷键序列(&Q)"
-#: shortcuts.cpp:187
+#: shortcuts.cpp:211
msgid "App&lication Shortcuts"
msgstr "应用程序快捷键(&L)"
-#: shortcuts.cpp:248
+#: shortcuts.cpp:272
msgid "User-Defined Scheme"
msgstr "用户定义方案"
-#: shortcuts.cpp:249
+#: shortcuts.cpp:273
msgid "Current Scheme"
msgstr "当前方案"
-#: shortcuts.cpp:292
+#: shortcuts.cpp:316
msgid ""
"Your current changes will be lost if you load another scheme before saving this "
"one."
msgstr "在保存之前您装载另外一个方案的话,您当前的改变 将丢失。"
-#: shortcuts.cpp:312
+#: shortcuts.cpp:336
msgid ""
"This scheme requires the \"%1\" modifier key, which is not available on your "
"keyboard layout. Do you wish to view it anyway?"
msgstr "此方案需要修饰键“%1”,但该键在您的键盘布局上是没有用的。您确实想查看它吗?"
-#: modifiers.cpp:194 modifiers.cpp:290 shortcuts.cpp:314
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
msgid "Win"
msgstr "Win"
-#: shortcuts.cpp:341 shortcuts.cpp:374
+#: shortcuts.cpp:365 shortcuts.cpp:398
msgid "Save Key Scheme"
msgstr "保存按键方案"
-#: shortcuts.cpp:342
+#: shortcuts.cpp:366
msgid "Enter a name for the key scheme:"
msgstr "为按键方案输入一个名称:"
-#: shortcuts.cpp:372
+#: shortcuts.cpp:396
msgid ""
"A key scheme with the name '%1' already exists;\n"
"do you want to overwrite it?\n"
@@ -106,37 +111,31 @@ msgstr ""
"名为“%1”的键盘方案已经存在;\n"
"您要覆盖它吗?\n"
-#: shortcuts.cpp:375
+#: shortcuts.cpp:399
msgid "Overwrite"
msgstr "覆盖"
-#: modifiers.cpp:174
+#: modifiers.cpp:175
msgid "TDE Modifiers"
msgstr "TDE 修饰键"
-#: modifiers.cpp:177
+#: modifiers.cpp:178
msgid "Modifier"
msgstr "修饰键"
-#: modifiers.cpp:182 modifiers.cpp:235
+#: modifiers.cpp:183 modifiers.cpp:236
msgid "X11-Mod"
msgstr "X11-Mod"
-#: modifiers.cpp:188 modifiers.cpp:288
-msgid ""
-"_: QAccel\n"
-"Ctrl"
-msgstr "Ctrl"
-
-#: modifiers.cpp:207
+#: modifiers.cpp:208
msgid "Macintosh keyboard"
msgstr "Macintosh 键盘"
-#: modifiers.cpp:212
+#: modifiers.cpp:213
msgid "MacOS-style modifier usage"
msgstr "MacOS 风格的修改键用法"
-#: modifiers.cpp:215
+#: modifiers.cpp:216
msgid ""
"Checking this box will change your X Modifier Mapping to better reflect the "
"standard MacOS modifier key usage. It allows you to use <i>Command+C</i> for <i>"
@@ -149,32 +148,32 @@ msgstr ""
",而不是标准的 PC 用法<i>Ctrl+C</i>。<b>Command</b> 将用于应用程序和控制台命令,<b>Option</b> "
"将用于命令修改键以及导航菜单和对话框,而 <b>Control</b> 用于窗口管理命令。"
-#: modifiers.cpp:228
+#: modifiers.cpp:229
msgid "X Modifier Mapping"
msgstr "X-Window修饰键映射"
-#: modifiers.cpp:278 modifiers.cpp:284 treeview.cpp:108
+#: modifiers.cpp:279 modifiers.cpp:285 treeview.cpp:108
msgid "Command"
msgstr "Command"
-#: modifiers.cpp:279 modifiers.cpp:283
+#: modifiers.cpp:280 modifiers.cpp:284
msgid "Option"
msgstr "Option"
-#: modifiers.cpp:280 modifiers.cpp:282
+#: modifiers.cpp:281 modifiers.cpp:283
msgid "Control"
msgstr "Control"
-#: modifiers.cpp:297
+#: modifiers.cpp:298
#, c-format
msgid "Key %1"
msgstr "按键 %1"
-#: modifiers.cpp:330
+#: modifiers.cpp:331
msgid "None"
msgstr "无"
-#: modifiers.cpp:343
+#: modifiers.cpp:344
msgid ""
"You can only activate this option if your X keyboard layout has the 'Super' or "
"'Meta' keys properly configured as modifier keys."
@@ -299,366 +298,466 @@ msgid "Walk Through Windows (Reverse)"
msgstr "遍历窗口(反向)"
#: ../../twin/twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "遍历窗口"
+
+#: ../../twin/twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "遍历窗口(反向)"
+
+#: ../../twin/twinbindings.cpp:25
msgid "Walk Through Desktops"
msgstr "遍历桌面"
-#: ../../twin/twinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:26
msgid "Walk Through Desktops (Reverse)"
msgstr "遍历桌面(反向)"
-#: ../../twin/twinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:27
msgid "Walk Through Desktop List"
msgstr "遍历桌面列表"
-#: ../../twin/twinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:28
msgid "Walk Through Desktop List (Reverse)"
msgstr "遍历桌面列表(反向)"
-#: ../../twin/twinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:30
msgid "Windows"
msgstr "窗口"
-#: ../../twin/twinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:31
msgid "Window Operations Menu"
msgstr "窗口操作菜单"
-#: ../../twin/twinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:32
msgid "Close Window"
msgstr "关闭窗口"
-#: ../../twin/twinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:34
msgid "Maximize Window"
msgstr "最大化窗口"
-#: ../../twin/twinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:36
msgid "Maximize Window Vertically"
msgstr "垂直最大化窗口"
-#: ../../twin/twinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:38
msgid "Maximize Window Horizontally"
msgstr "水平最大化窗口"
-#: ../../twin/twinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:40
msgid "Minimize Window"
msgstr "最小化窗口"
-#: ../../twin/twinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:42
msgid "Shade Window"
msgstr "卷起窗口"
-#: ../../twin/twinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:44
msgid "Move Window"
msgstr "移动窗口"
-#: ../../twin/twinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:46
msgid "Resize Window"
msgstr "更改窗口大小"
-#: ../../twin/twinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:48
msgid "Raise Window"
msgstr "升起窗口"
-#: ../../twin/twinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:50
msgid "Lower Window"
msgstr "降低窗口"
-#: ../../twin/twinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:52
msgid "Toggle Window Raise/Lower"
msgstr "窗口置前或置后"
-#: ../../twin/twinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:53
msgid "Make Window Fullscreen"
msgstr "将窗口放至全屏"
-#: ../../twin/twinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:55
msgid "Hide Window Border"
msgstr "隐藏窗口边框"
-#: ../../twin/twinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:57
msgid "Keep Window Above Others"
msgstr "让窗口常居顶端"
-#: ../../twin/twinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:59
msgid "Keep Window Below Others"
msgstr "让窗口常居底端"
-#: ../../twin/twinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:61
msgid "Activate Window Demanding Attention"
msgstr "激活请求注意的窗口"
-#: ../../twin/twinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:62
msgid "Setup Window Shortcut"
msgstr "设置窗口快捷键"
-#: ../../twin/twinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:63
msgid "Pack Window to the Right"
msgstr "将窗口推至右侧"
-#: ../../twin/twinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:65
msgid "Pack Window to the Left"
msgstr "将窗口推至左侧"
-#: ../../twin/twinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:67
msgid "Pack Window Up"
msgstr "将窗口推至上侧"
-#: ../../twin/twinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:69
msgid "Pack Window Down"
msgstr "将窗口推至下侧"
-#: ../../twin/twinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:71
msgid "Pack Grow Window Horizontally"
msgstr "将窗口水平扩展"
-#: ../../twin/twinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:73
msgid "Pack Grow Window Vertically"
msgstr "将窗口垂直扩展"
-#: ../../twin/twinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:75
msgid "Pack Shrink Window Horizontally"
msgstr "将窗口水平收缩"
-#: ../../twin/twinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:77
msgid "Pack Shrink Window Vertically"
msgstr "将窗口垂直收缩"
-#: ../../twin/twinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:80
msgid "Window & Desktop"
msgstr "窗口和桌面"
-#: ../../twin/twinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:81
msgid "Keep Window on All Desktops"
msgstr "将窗口放到全部桌面"
-#: ../../twin/twinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:83
msgid "Window to Desktop 1"
msgstr "窗口到桌面 1"
-#: ../../twin/twinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:84
msgid "Window to Desktop 2"
msgstr "窗口到桌面 2"
-#: ../../twin/twinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:85
msgid "Window to Desktop 3"
msgstr "窗口到桌面 3"
-#: ../../twin/twinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:86
msgid "Window to Desktop 4"
msgstr "窗口到桌面 4"
-#: ../../twin/twinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:87
msgid "Window to Desktop 5"
msgstr "窗口到桌面 5"
-#: ../../twin/twinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:88
msgid "Window to Desktop 6"
msgstr "窗口到桌面 6"
-#: ../../twin/twinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:89
msgid "Window to Desktop 7"
msgstr "窗口到桌面 7"
-#: ../../twin/twinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:90
msgid "Window to Desktop 8"
msgstr "窗口到桌面 8"
-#: ../../twin/twinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:91
msgid "Window to Desktop 9"
msgstr "窗口到桌面 9"
-#: ../../twin/twinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:92
msgid "Window to Desktop 10"
msgstr "窗口到桌面 10"
-#: ../../twin/twinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:93
msgid "Window to Desktop 11"
msgstr "窗口到桌面 11"
-#: ../../twin/twinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:94
msgid "Window to Desktop 12"
msgstr "窗口到桌面 12"
-#: ../../twin/twinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:95
msgid "Window to Desktop 13"
msgstr "窗口到桌面 13"
-#: ../../twin/twinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:96
msgid "Window to Desktop 14"
msgstr "窗口到桌面 14"
-#: ../../twin/twinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:97
msgid "Window to Desktop 15"
msgstr "窗口到桌面 15"
-#: ../../twin/twinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:98
msgid "Window to Desktop 16"
msgstr "窗口到桌面 16"
-#: ../../twin/twinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:99
msgid "Window to Desktop 17"
msgstr "窗口到桌面 17"
-#: ../../twin/twinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:100
msgid "Window to Desktop 18"
msgstr "窗口到桌面 18"
-#: ../../twin/twinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:101
msgid "Window to Desktop 19"
msgstr "窗口到桌面 19"
-#: ../../twin/twinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:102
msgid "Window to Desktop 20"
msgstr "窗口到桌面 20"
-#: ../../twin/twinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:103
msgid "Window to Next Desktop"
msgstr "窗口到后一桌面"
-#: ../../twin/twinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:104
msgid "Window to Previous Desktop"
msgstr "窗口到前一桌面"
-#: ../../twin/twinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:105
msgid "Window One Desktop to the Right"
msgstr "窗口右移一个桌面"
-#: ../../twin/twinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:106
msgid "Window One Desktop to the Left"
msgstr "窗口左移一个桌面"
-#: ../../twin/twinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:107
msgid "Window One Desktop Up"
msgstr "窗口上移一个桌面"
-#: ../../twin/twinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:108
msgid "Window One Desktop Down"
msgstr "切换下移一个桌面"
-#: ../../twin/twinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "窗口到后一桌面"
+
+#: ../../twin/twinbindings.cpp:119
msgid "Desktop Switching"
msgstr "桌面切换"
-#: ../../twin/twinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:120
msgid "Switch to Desktop 1"
msgstr "切换到桌面 1"
-#: ../../twin/twinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:121
msgid "Switch to Desktop 2"
msgstr "切换到桌面 2"
-#: ../../twin/twinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:122
msgid "Switch to Desktop 3"
msgstr "切换到桌面 3"
-#: ../../twin/twinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:123
msgid "Switch to Desktop 4"
msgstr "切换到桌面 4"
-#: ../../twin/twinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:124
msgid "Switch to Desktop 5"
msgstr "切换到桌面 5"
-#: ../../twin/twinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:125
msgid "Switch to Desktop 6"
msgstr "切换到桌面 6"
-#: ../../twin/twinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:126
msgid "Switch to Desktop 7"
msgstr "切换到桌面 7"
-#: ../../twin/twinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:127
msgid "Switch to Desktop 8"
msgstr "切换到桌面 8"
-#: ../../twin/twinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:128
msgid "Switch to Desktop 9"
msgstr "切换到桌面 9"
-#: ../../twin/twinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:129
msgid "Switch to Desktop 10"
msgstr "切换到桌面 10"
-#: ../../twin/twinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:130
msgid "Switch to Desktop 11"
msgstr "切换到桌面 11"
-#: ../../twin/twinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:131
msgid "Switch to Desktop 12"
msgstr "切换到桌面 12"
-#: ../../twin/twinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:132
msgid "Switch to Desktop 13"
msgstr "切换到桌面 13"
-#: ../../twin/twinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:133
msgid "Switch to Desktop 14"
msgstr "切换到桌面 14"
-#: ../../twin/twinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:134
msgid "Switch to Desktop 15"
msgstr "切换到桌面 15"
-#: ../../twin/twinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:135
msgid "Switch to Desktop 16"
msgstr "切换到桌面 16"
-#: ../../twin/twinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:136
msgid "Switch to Desktop 17"
msgstr "切换到桌面 17"
-#: ../../twin/twinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:137
msgid "Switch to Desktop 18"
msgstr "切换到桌面 18"
-#: ../../twin/twinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:138
msgid "Switch to Desktop 19"
msgstr "切换到桌面 19"
-#: ../../twin/twinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:139
msgid "Switch to Desktop 20"
msgstr "切换到桌面 20"
-#: ../../twin/twinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:140
msgid "Switch to Next Desktop"
msgstr "切换到后一桌面"
-#: ../../twin/twinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:141
msgid "Switch to Previous Desktop"
msgstr "切换到前一桌面"
-#: ../../twin/twinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:142
msgid "Switch One Desktop to the Right"
msgstr "切换到右边桌面"
-#: ../../twin/twinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:143
msgid "Switch One Desktop to the Left"
msgstr "切换到左边桌面"
-#: ../../twin/twinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:144
msgid "Switch One Desktop Up"
msgstr "切换到上面的桌面"
-#: ../../twin/twinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:145
msgid "Switch One Desktop Down"
msgstr "切换到下面的桌面"
-#: ../../twin/twinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "切换到桌面 10"
+
+#: ../../twin/twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "切换到桌面 1"
+
+#: ../../twin/twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "切换到桌面 2"
+
+#: ../../twin/twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "切换到桌面 3"
+
+#: ../../twin/twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "切换到桌面 4"
+
+#: ../../twin/twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "切换到桌面 5"
+
+#: ../../twin/twinbindings.cpp:152
+#, fuzzy
+msgid "Switch to Screen 6"
+msgstr "切换到桌面 6"
+
+#: ../../twin/twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "切换到桌面 7"
+
+#: ../../twin/twinbindings.cpp:154
+#, fuzzy
+msgid "Switch to Next Screen"
+msgstr "切换到后一桌面"
+
+#: ../../twin/twinbindings.cpp:157
msgid "Mouse Emulation"
msgstr "鼠标仿真"
-#: ../../twin/twinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:158
msgid "Kill Window"
msgstr "杀死窗口"
-#: ../../twin/twinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:159
msgid "Window Screenshot"
msgstr "窗口抓图"
-#: ../../twin/twinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:160
msgid "Desktop Screenshot"
msgstr "桌面抓图"
-#: ../../twin/twinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:165
msgid "Block Global Shortcuts"
msgstr "屏蔽全局快捷键"
@@ -706,19 +805,28 @@ msgstr "切换用户"
msgid "Lock Session"
msgstr "锁住会话"
-#: ../../kdesktop/kdesktopbindings.cpp:37
+#: ../../kdesktop/kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "锁住会话"
+
+#: ../../kdesktop/kdesktopbindings.cpp:38
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:44
msgid "Log Out"
msgstr "注销"
-#: ../../kdesktop/kdesktopbindings.cpp:38
+#: ../../kdesktop/kdesktopbindings.cpp:45
msgid "Log Out Without Confirmation"
msgstr "不加确认注销"
-#: ../../kdesktop/kdesktopbindings.cpp:39
+#: ../../kdesktop/kdesktopbindings.cpp:46
msgid "Halt without Confirmation"
msgstr "不加确认关机"
-#: ../../kdesktop/kdesktopbindings.cpp:40
+#: ../../kdesktop/kdesktopbindings.cpp:47
msgid "Reboot without Confirmation"
msgstr "不加确认重新启动"
@@ -745,3 +853,8 @@ msgstr "键盘"
#: ../../kxkb/kxkbbindings.cpp:10
msgid "Switch to Next Keyboard Layout"
msgstr "切换到下一个键盘布局"
+
+#~ msgid ""
+#~ "_: QAccel\n"
+#~ "Ctrl"
+#~ msgstr "Ctrl"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
index 3a4ec3e1d08..2340edf2e55 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-06-11 13:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -93,21 +94,21 @@ msgstr ""
msgid "Main Panel"
msgstr "主面板"
-#. i18n: file hidingtab.ui line 371
-#: hidingtab_impl.cpp:216 rc.cpp:197
+#. i18n: file hidingtab.ui line 385
+#: hidingtab_impl.cpp:222 rc.cpp:224
#, no-c-format
msgid "Show left panel-hiding bu&tton"
msgstr "显示左面板的隐藏按钮(&T)"
-#: hidingtab_impl.cpp:217
+#: hidingtab_impl.cpp:223
msgid "Show right panel-hiding bu&tton"
msgstr "显示右面板的隐藏按钮(&B)"
-#: hidingtab_impl.cpp:221
+#: hidingtab_impl.cpp:227
msgid "Show top panel-hiding bu&tton"
msgstr "显示上面板的隐藏按钮(&T)"
-#: hidingtab_impl.cpp:222
+#: hidingtab_impl.cpp:228
msgid "Show bottom panel-hiding bu&tton"
msgstr "显示下面板的隐藏按钮(&T)"
@@ -127,11 +128,11 @@ msgstr ""
"%1\n"
"%2"
-#: lookandfeeltab_kcm.cpp:36 main.cpp:346
+#: lookandfeeltab_kcm.cpp:36 main.cpp:358
msgid "kcmkicker"
msgstr "kcmkicker"
-#: lookandfeeltab_kcm.cpp:36 main.cpp:347
+#: lookandfeeltab_kcm.cpp:36 main.cpp:359
msgid "TDE Panel Control Module"
msgstr "TDE 面板控制模块"
@@ -143,7 +144,7 @@ msgstr ""
"(C) 1999 - 2001 Matthias Elter\n"
"(c) 2002 Aaron J. Seigo"
-#: lookandfeeltab_kcm.cpp:86 main.cpp:333
+#: lookandfeeltab_kcm.cpp:86 main.cpp:345
msgid ""
"<h1>Panel</h1> Here you can configure the TDE panel (also referred to as "
"'kicker'). This includes options like the position and size of the panel, as "
@@ -156,19 +157,21 @@ msgstr ""
"<h1>面板</h1>您可以配置 TDE 面板(也称为“kicker”)。这包括面板的位置和大小选项,还有它的自动隐藏行为和外观。"
"<p> 注意您也可以通过直接点击面板(例如用鼠标左键拖动它,或使用右键的即时菜单)来访问这些选项。该即时菜单也可以让您控制面板的按钮和小程序。"
-#: main.cpp:349
+#: main.cpp:361
+#, fuzzy
msgid ""
+"(c) 2009 - 2010 Timothy Pearson\n"
"(c) 1999 - 2001 Matthias Elter\n"
"(c) 2002 - 2003 Aaron J. Seigo"
msgstr ""
"(c) 1999 - 2001 Matthias Elter\n"
"(c) 2002 - 2003 Aaron J. Seigo"
-#: menutab_impl.cpp:99
+#: menutab_impl.cpp:129
msgid "Quick Browser"
msgstr "快捷浏览"
-#: menutab_impl.cpp:177
+#: menutab_impl.cpp:311
msgid ""
"The TDE menu editor (kmenuedit) could not be launched.\n"
"Perhaps it is not installed or not in your path."
@@ -176,7 +179,7 @@ msgstr ""
"TDE 菜单编辑器 (kmenuedit) 无法启动。\n"
"可能它没有安装或者不在您的执行路径上。"
-#: menutab_impl.cpp:179
+#: menutab_impl.cpp:313
msgid "Application Missing"
msgstr "程序找不到"
@@ -233,7 +236,7 @@ msgid "All Screens"
msgstr "全部屏幕"
#. i18n: file positiontab.ui line 412
-#: positiontab_impl.cpp:535 rc.cpp:528
+#: positiontab_impl.cpp:535 rc.cpp:618
#, no-c-format
msgid "Custom"
msgstr "自定义"
@@ -259,7 +262,7 @@ msgid ""
msgstr "这个选项指定面板上隐藏按钮显示的大小。"
#. i18n: file advancedOptions.ui line 52
-#: rc.cpp:12 rc.cpp:534
+#: rc.cpp:12 rc.cpp:624
#, no-c-format
msgid " pixels"
msgstr " 像素"
@@ -394,80 +397,126 @@ msgstr ""
"通常情况下,如果您在屏幕最上方将桌面或当前应用程序的菜单栏显示为面板的话(MacOS "
"样式),该面板的透明样式是被禁用的,这样可以避免背景干扰菜单栏。设定此选项将使得该面板也透明。"
-#. i18n: file applettab.ui line 24
+#. i18n: file advancedOptions.ui line 304
#: rc.cpp:86
#, no-c-format
+msgid "Blur the background when transparency is enabled"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 307
+#: rc.cpp:89
+#, no-c-format
+msgid ""
+"When checked, the displayed semi-transparent background image will be blurred "
+"to reduce eyestrain"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 317
+#: rc.cpp:92
+#, no-c-format
+msgid "Texture"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 328
+#: rc.cpp:95
+#, no-c-format
+msgid "Show resize handle on panels"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 331
+#: rc.cpp:98
+#, no-c-format
+msgid ""
+"Enabling this option will show a resize handle on the resizable end of each "
+"panel."
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 339
+#: rc.cpp:101
+#, no-c-format
+msgid "Use deep buttons"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 342
+#: rc.cpp:104
+#, no-c-format
+msgid "Enabling this option will yield more highly textured panels."
+msgstr ""
+
+#. i18n: file applettab.ui line 24
+#: rc.cpp:107
+#, no-c-format
msgid "Security Level"
msgstr "安全级别"
#. i18n: file applettab.ui line 35
-#: rc.cpp:89
+#: rc.cpp:110
#, no-c-format
msgid "Load only trusted applets internal"
msgstr "仅内部载入受信任的小程序"
#. i18n: file applettab.ui line 43
-#: rc.cpp:92
+#: rc.cpp:113
#, no-c-format
msgid "Load startup config applets internal"
msgstr "内部载入启动配置小程序"
#. i18n: file applettab.ui line 51
-#: rc.cpp:95
+#: rc.cpp:116
#, no-c-format
msgid "Load all applets internal"
msgstr "内部载入所有的小程序"
#. i18n: file applettab.ui line 67
-#: rc.cpp:98
+#: rc.cpp:119
#, no-c-format
msgid "List of Trusted Applets"
msgstr "受信任的小程序的列表"
#. i18n: file applettab.ui line 84
-#: rc.cpp:101
+#: rc.cpp:122
#, no-c-format
msgid "Available Applets"
msgstr "可用的小程序"
#. i18n: file applettab.ui line 133
-#: rc.cpp:104
+#: rc.cpp:125
#, no-c-format
msgid ">>"
msgstr ">>"
#. i18n: file applettab.ui line 172
-#: rc.cpp:107
+#: rc.cpp:128
#, no-c-format
msgid "<<"
msgstr "<<"
#. i18n: file applettab.ui line 197
-#: rc.cpp:110
+#: rc.cpp:131
#, no-c-format
msgid "Trusted Applets"
msgstr "信任的小程序"
#. i18n: file hidingtab.ui line 44
-#: rc.cpp:113 rc.cpp:467
+#: rc.cpp:134 rc.cpp:557
#, no-c-format
msgid "S&ettings for:"
msgstr "设置(&E):"
#. i18n: file hidingtab.ui line 79
-#: rc.cpp:116
+#: rc.cpp:137
#, no-c-format
msgid "Hide Mode"
msgstr "隐藏模式"
#. i18n: file hidingtab.ui line 107
-#: rc.cpp:119
+#: rc.cpp:140
#, no-c-format
msgid "On&ly hide when a panel-hiding button is clicked"
msgstr "点击隐藏按钮才隐藏(&L)"
#. i18n: file hidingtab.ui line 113
-#: rc.cpp:122
+#: rc.cpp:143
#, no-c-format
msgid ""
"If this option is selected, the only way to hide the panel will be to click on "
@@ -475,38 +524,38 @@ msgid ""
msgstr "如果此项被选中,点击面板两端的隐藏按钮将是隐藏面板的唯一方式。"
#. i18n: file hidingtab.ui line 138
-#: rc.cpp:125
+#: rc.cpp:146
#, no-c-format
msgid " sec"
msgstr " 秒"
#. i18n: file hidingtab.ui line 141
-#: rc.cpp:128
+#: rc.cpp:149
#, no-c-format
msgid "Immediately"
msgstr "立刻隐藏"
#. i18n: file hidingtab.ui line 144
-#: rc.cpp:131 rc.cpp:137
+#: rc.cpp:152 rc.cpp:158
#, no-c-format
msgid ""
"Here you can change the delay after which the panel will disappear if not used."
msgstr "您可以修改面板多长时间不使用后就会隐藏。"
#. i18n: file hidingtab.ui line 163
-#: rc.cpp:134
+#: rc.cpp:155
#, no-c-format
msgid "after the &cursor leaves the panel"
msgstr "光标离开面板后(&C)"
#. i18n: file hidingtab.ui line 199
-#: rc.cpp:140
+#: rc.cpp:161
#, no-c-format
msgid "Allow other &windows to cover the panel"
msgstr "允许其它窗口覆盖面板(&W)"
#. i18n: file hidingtab.ui line 202
-#: rc.cpp:143
+#: rc.cpp:164
#, no-c-format
msgid ""
"If this option is selected, the panel will allow itself to be covered by other "
@@ -514,13 +563,13 @@ msgid ""
msgstr "如果选中这个选项,面板将允许自己被其它窗口覆盖。"
#. i18n: file hidingtab.ui line 213
-#: rc.cpp:146
+#: rc.cpp:167
#, no-c-format
msgid "Hide a&utomatically"
msgstr "自动隐藏(&U)"
#. i18n: file hidingtab.ui line 216
-#: rc.cpp:149
+#: rc.cpp:170
#, no-c-format
msgid ""
"If this option is selected, the panel will automatically hide after a period of "
@@ -530,13 +579,13 @@ msgid ""
msgstr "如果启用这个选项,面板将在一段时间后自动隐藏,并在您将鼠标移动到靠近面板的屏幕边缘时重新出现。这在低分辨率下特别有用,例如某些膝上型电脑。"
#. i18n: file hidingtab.ui line 235
-#: rc.cpp:152
+#: rc.cpp:173
#, no-c-format
msgid "&Raise when the pointer touches the screen's:"
msgstr "升到最前面,如果鼠标移到屏幕的(&R):"
#. i18n: file hidingtab.ui line 238
-#: rc.cpp:155
+#: rc.cpp:176
#, no-c-format
msgid ""
"When this option is selected, moving the pointer to the specified edge of the "
@@ -545,55 +594,55 @@ msgid ""
msgstr "此个选项被选中时,将鼠标移到选定的屏幕边角,面板就将显示在其它窗口上面,不再被盖住。"
#. i18n: file hidingtab.ui line 244
-#: rc.cpp:158
+#: rc.cpp:179
#, no-c-format
msgid "Top Left Corner"
msgstr "左上角"
#. i18n: file hidingtab.ui line 249
-#: rc.cpp:161
+#: rc.cpp:182
#, no-c-format
msgid "Top Edge"
msgstr "上边缘"
#. i18n: file hidingtab.ui line 254
-#: rc.cpp:164
+#: rc.cpp:185
#, no-c-format
msgid "Top Right Corner"
msgstr "右上角"
#. i18n: file hidingtab.ui line 259
-#: rc.cpp:167
+#: rc.cpp:188
#, no-c-format
msgid "Right Edge"
msgstr "右边缘"
#. i18n: file hidingtab.ui line 264
-#: rc.cpp:170
+#: rc.cpp:191
#, no-c-format
msgid "Bottom Right Corner"
msgstr "右下角"
#. i18n: file hidingtab.ui line 269
-#: rc.cpp:173
+#: rc.cpp:194
#, no-c-format
msgid "Bottom Edge"
msgstr "下边缘"
#. i18n: file hidingtab.ui line 274
-#: rc.cpp:176
+#: rc.cpp:197
#, no-c-format
msgid "Bottom Left Corner"
msgstr "左下角"
#. i18n: file hidingtab.ui line 279
-#: rc.cpp:179
+#: rc.cpp:200
#, no-c-format
msgid "Left Edge"
msgstr "左边缘"
#. i18n: file hidingtab.ui line 289
-#: rc.cpp:182
+#: rc.cpp:203
#, no-c-format
msgid ""
"Here you can set the location on the screen's edge that will bring the panel to "
@@ -601,13 +650,28 @@ msgid ""
msgstr "这里您可以选择把鼠标移到屏幕的边角部位就使面板升到最上面。"
#. i18n: file hidingtab.ui line 319
-#: rc.cpp:185
+#: rc.cpp:206
+#, no-c-format
+msgid "&Hide panel when configured screen is not available"
+msgstr ""
+
+#. i18n: file hidingtab.ui line 322
+#: rc.cpp:209
+#, no-c-format
+msgid ""
+"When this option is selected, this panel will be hidden if its Xinerama screen "
+"is not available. This panel will be automatically restored when the "
+"configured Xinerama screen is reenabked."
+msgstr ""
+
+#. i18n: file hidingtab.ui line 333
+#: rc.cpp:212
#, no-c-format
msgid "Show panel when switching &desktops"
msgstr "在切换桌面时显示面板(&D)"
-#. i18n: file hidingtab.ui line 322
-#: rc.cpp:188
+#. i18n: file hidingtab.ui line 336
+#: rc.cpp:215
#, no-c-format
msgid ""
"If this option is enabled, the panel will automatically show itself for a brief "
@@ -615,14 +679,14 @@ msgid ""
"are on."
msgstr "如果启用该选项,当桌面切换时面板将自动显示一小段时间,这样您可以知道您现在在哪个桌面上。"
-#. i18n: file hidingtab.ui line 357
-#: rc.cpp:191
+#. i18n: file hidingtab.ui line 371
+#: rc.cpp:218
#, no-c-format
msgid "Panel-Hiding Buttons"
msgstr "隐藏面板的按钮"
-#. i18n: file hidingtab.ui line 360
-#: rc.cpp:194
+#. i18n: file hidingtab.ui line 374
+#: rc.cpp:221
#, no-c-format
msgid ""
"This option controls the panel-hiding buttons, which are buttons with a small "
@@ -630,74 +694,74 @@ msgid ""
"of the panel, or both. Clicking on one of these buttons will hide the panel."
msgstr "此选项控制面板两端画着小三角的隐藏按钮。您可以把隐藏按钮安排在面板的任意一端,或两端都有。点击任何一个隐藏按钮就能使面板隐藏起来。"
-#. i18n: file hidingtab.ui line 377
-#: rc.cpp:200
+#. i18n: file hidingtab.ui line 391
+#: rc.cpp:227
#, no-c-format
msgid ""
"When this option is selected, a panel-hiding button appears on the left end of "
"the panel."
msgstr "选中此项时,面板条左端将出现一个隐藏按钮。"
-#. i18n: file hidingtab.ui line 385
-#: rc.cpp:203
+#. i18n: file hidingtab.ui line 399
+#: rc.cpp:230
#, no-c-format
msgid "Show right panel-hiding &button"
msgstr "显示右边的隐藏按钮(&B)"
-#. i18n: file hidingtab.ui line 391
-#: rc.cpp:206
+#. i18n: file hidingtab.ui line 405
+#: rc.cpp:233
#, no-c-format
msgid ""
"When this option is selected, a panel-hiding button appears on the right end of "
"the panel."
msgstr "选中此项时,面板条右端将出现一个隐藏按钮。"
-#. i18n: file hidingtab.ui line 426
-#: rc.cpp:209
+#. i18n: file hidingtab.ui line 440
+#: rc.cpp:236
#, no-c-format
msgid "Panel Animation"
msgstr "面板动画"
-#. i18n: file hidingtab.ui line 454
-#: rc.cpp:212
+#. i18n: file hidingtab.ui line 468
+#: rc.cpp:239
#, no-c-format
msgid "A&nimate panel hiding"
msgstr "面板动画隐藏(&N)"
-#. i18n: file hidingtab.ui line 457
-#: rc.cpp:215
+#. i18n: file hidingtab.ui line 471
+#: rc.cpp:242
#, no-c-format
msgid ""
"When this option is selected the panel will \"slide\" off the screen when "
"hiding. The speed of the animation is controlled by the slider directly below."
msgstr "选中此项后,面板隐藏时将慢慢“滑出”屏幕。动画的速度由下面紧挨着的滑动杆控制。"
-#. i18n: file hidingtab.ui line 522
-#: rc.cpp:218
+#. i18n: file hidingtab.ui line 536
+#: rc.cpp:245
#, no-c-format
msgid "Determines how quickly the panel hides if hiding animation is enabled."
msgstr "决定面板动画隐藏的速度。"
-#. i18n: file hidingtab.ui line 558
-#: rc.cpp:221
+#. i18n: file hidingtab.ui line 572
+#: rc.cpp:248
#, no-c-format
msgid "Fast"
msgstr "快"
-#. i18n: file hidingtab.ui line 599
-#: rc.cpp:224
+#. i18n: file hidingtab.ui line 613
+#: rc.cpp:251
#, no-c-format
msgid "Medium"
msgstr "中"
-#. i18n: file hidingtab.ui line 623
-#: rc.cpp:227
+#. i18n: file hidingtab.ui line 637
+#: rc.cpp:254
#, no-c-format
msgid "Slow"
msgstr "慢"
#. i18n: file lookandfeeltab.ui line 16
-#: rc.cpp:230
+#: rc.cpp:257
#, no-c-format
msgid ""
"If this option is selected, informational tooltips will appear when the mouse "
@@ -705,19 +769,19 @@ msgid ""
msgstr "如果选中此项,当鼠标移动到面板上的图标、按钮和小程序上时,将会出现工具提示条。"
#. i18n: file lookandfeeltab.ui line 30
-#: rc.cpp:233
+#: rc.cpp:260
#, no-c-format
msgid "General"
msgstr "常规"
#. i18n: file lookandfeeltab.ui line 41
-#: rc.cpp:236
+#: rc.cpp:263
#, no-c-format
msgid "Enable icon &mouseover effects"
msgstr "启用图标鼠标悬停特效(&M)"
#. i18n: file lookandfeeltab.ui line 44
-#: rc.cpp:239
+#: rc.cpp:266
#, no-c-format
msgid ""
"When this option is selected a mouseover effect appears when the mouse cursor "
@@ -725,145 +789,159 @@ msgid ""
msgstr "如果启用这个选项,当鼠标移动到按钮图标上时,图标会被放大。"
#. i18n: file lookandfeeltab.ui line 52
-#: rc.cpp:242
+#: rc.cpp:269
+#, fuzzy, no-c-format
+msgid "Enable icon activation effects"
+msgstr "启用图标鼠标悬停特效(&M)"
+
+#. i18n: file lookandfeeltab.ui line 55
+#: rc.cpp:272
+#, fuzzy, no-c-format
+msgid ""
+"When this option is selected an activation effect appears when panel buttons "
+"are left clicked."
+msgstr "如果启用这个选项,当鼠标移动到按钮图标上时,图标会被放大。"
+
+#. i18n: file lookandfeeltab.ui line 63
+#: rc.cpp:275
#, no-c-format
msgid "Show too&ltips"
msgstr "显示工具提示(&L)"
-#. i18n: file lookandfeeltab.ui line 55
-#: rc.cpp:245
+#. i18n: file lookandfeeltab.ui line 66
+#: rc.cpp:278
#, no-c-format
msgid ""
"When this option is selected informational tooltips will appear when the mouse "
"cursor moves over the icons, buttons and applets in the panel."
msgstr "如果选中此项,当鼠标移动到面板上的图标、按钮和小程序上时,将会出现工具提示条。"
-#. i18n: file lookandfeeltab.ui line 65
-#: rc.cpp:248
+#. i18n: file lookandfeeltab.ui line 76
+#: rc.cpp:281
#, no-c-format
msgid "Button Backgrounds"
msgstr "按钮背景"
-#. i18n: file lookandfeeltab.ui line 76
-#: rc.cpp:251
+#. i18n: file lookandfeeltab.ui line 87
+#: rc.cpp:284
#, no-c-format
msgid "&TDE menu:"
msgstr "&K 菜单:"
-#. i18n: file lookandfeeltab.ui line 82
-#: rc.cpp:254 rc.cpp:278
+#. i18n: file lookandfeeltab.ui line 93
+#: rc.cpp:287 rc.cpp:311
#, no-c-format
msgid "Choose a tile image for the TDE menu."
msgstr "为 K 菜单选择一个平铺图像。"
-#. i18n: file lookandfeeltab.ui line 90
-#: rc.cpp:257
+#. i18n: file lookandfeeltab.ui line 101
+#: rc.cpp:290
#, no-c-format
msgid "&QuickBrowser menus:"
msgstr "快捷浏览菜单(&Q):"
-#. i18n: file lookandfeeltab.ui line 96
-#: rc.cpp:260 rc.cpp:269
+#. i18n: file lookandfeeltab.ui line 107
+#: rc.cpp:293 rc.cpp:302
#, no-c-format
msgid "Choose a tile image for Quick Browser buttons."
msgstr "为快捷浏览按钮选择一个平铺图像。"
-#. i18n: file lookandfeeltab.ui line 107
-#: rc.cpp:266 rc.cpp:275 rc.cpp:290 rc.cpp:308 rc.cpp:335
+#. i18n: file lookandfeeltab.ui line 118
+#: rc.cpp:299 rc.cpp:308 rc.cpp:323 rc.cpp:341 rc.cpp:368
#, no-c-format
msgid "Custom Color"
msgstr "自定义颜色"
-#. i18n: file lookandfeeltab.ui line 165
-#: rc.cpp:281
+#. i18n: file lookandfeeltab.ui line 176
+#: rc.cpp:314
#, no-c-format
msgid ""
"When the Custom Color option is selected, use this button to pick a color for "
"quick browser tile backgrounds"
msgstr "若选中了自定义颜色选项,请使用此按钮拾取快速浏览器的平铺背景"
-#. i18n: file lookandfeeltab.ui line 176
-#: rc.cpp:284
+#. i18n: file lookandfeeltab.ui line 187
+#: rc.cpp:317
#, no-c-format
msgid ""
"When the Custom Color option is selected, use this button to pick a color for "
"the TDE menu tile background"
msgstr "若选中了自定义颜色选项,请使用此按钮拾取 K 菜单的平铺背景"
-#. i18n: file lookandfeeltab.ui line 205
-#: rc.cpp:293 rc.cpp:302
+#. i18n: file lookandfeeltab.ui line 216
+#: rc.cpp:326 rc.cpp:335
#, no-c-format
msgid "Choose a tile image for window list buttons."
msgstr "为窗口列表按钮选择一个平铺图像。"
-#. i18n: file lookandfeeltab.ui line 216
-#: rc.cpp:296
+#. i18n: file lookandfeeltab.ui line 227
+#: rc.cpp:329
#, no-c-format
msgid ""
"When the Custom Color option is selected, use this button to pick a color for "
"window list tile backgrounds"
msgstr "若选中了自定义颜色选项,请使用此按钮拾取窗口列表的平铺背景"
-#. i18n: file lookandfeeltab.ui line 224
-#: rc.cpp:299
+#. i18n: file lookandfeeltab.ui line 235
+#: rc.cpp:332
#, no-c-format
msgid "&Window list:"
msgstr "窗口列表(&W):"
-#. i18n: file lookandfeeltab.ui line 259
-#: rc.cpp:311 rc.cpp:320
+#. i18n: file lookandfeeltab.ui line 270
+#: rc.cpp:344 rc.cpp:353
#, no-c-format
msgid "Choose a tile image for desktop access buttons."
msgstr "为桌面访问按钮选择一个平铺图像。"
-#. i18n: file lookandfeeltab.ui line 270
-#: rc.cpp:314
+#. i18n: file lookandfeeltab.ui line 281
+#: rc.cpp:347
#, no-c-format
msgid ""
"When the Custom Color option is selected, use this button to pick a color for "
"the desktop tile background"
msgstr "若选中了自定义颜色选项,请使用此按钮拾取桌面的平铺背景"
-#. i18n: file lookandfeeltab.ui line 278
-#: rc.cpp:317
+#. i18n: file lookandfeeltab.ui line 289
+#: rc.cpp:350
#, no-c-format
msgid "De&sktop access:"
msgstr "桌面访问(&S):"
-#. i18n: file lookandfeeltab.ui line 295
-#: rc.cpp:323
+#. i18n: file lookandfeeltab.ui line 306
+#: rc.cpp:356
#, no-c-format
msgid ""
"When the Custom Color option is selected, use this button to pick a color for "
"application tile backgrounds"
msgstr "若选中了自定义颜色选项,请使用此按钮拾取应用程序的平铺背景"
-#. i18n: file lookandfeeltab.ui line 303
-#: rc.cpp:326
+#. i18n: file lookandfeeltab.ui line 314
+#: rc.cpp:359
#, no-c-format
msgid "Applicatio&ns:"
msgstr "应用程序(&N):"
-#. i18n: file lookandfeeltab.ui line 309
-#: rc.cpp:329 rc.cpp:338
+#. i18n: file lookandfeeltab.ui line 320
+#: rc.cpp:362 rc.cpp:371
#, no-c-format
msgid "Choose a tile image for buttons that launch applications."
msgstr "为启动应用程序按钮选择一个平铺图像。"
-#. i18n: file lookandfeeltab.ui line 365
-#: rc.cpp:341
+#. i18n: file lookandfeeltab.ui line 376
+#: rc.cpp:374
#, no-c-format
msgid "Panel Background"
msgstr "面板背景"
-#. i18n: file lookandfeeltab.ui line 396
-#: rc.cpp:344
+#. i18n: file lookandfeeltab.ui line 407
+#: rc.cpp:377
#, no-c-format
msgid "Colorize to &match the desktop color scheme"
msgstr "按照桌面颜色方案着色(&M)"
-#. i18n: file lookandfeeltab.ui line 402
-#: rc.cpp:347
+#. i18n: file lookandfeeltab.ui line 413
+#: rc.cpp:380
#, no-c-format
msgid ""
"If this option is selected, the panel background image will be colored to match "
@@ -871,14 +949,14 @@ msgid ""
"module."
msgstr "如果选中了此选项,面板背景图像将按照默认颜色着色。要更改默认颜色,请前往“颜色”控制模块。"
-#. i18n: file lookandfeeltab.ui line 449
-#: rc.cpp:350
+#. i18n: file lookandfeeltab.ui line 460
+#: rc.cpp:383
#, no-c-format
msgid "This is a preview for the selected background image."
msgstr "这是选中的背景图像的预览。"
-#. i18n: file lookandfeeltab.ui line 469
-#: rc.cpp:353
+#. i18n: file lookandfeeltab.ui line 480
+#: rc.cpp:386
#, no-c-format
msgid ""
"Here you can choose a theme to be displayed by the panel. Press the 'Browse' "
@@ -888,120 +966,200 @@ msgstr ""
"您可在这里选择面板所显示的主题。按下“浏览”按钮可使用文件对话框选择主题。\n"
"此选项仅当“启用背景图像”选中时才有效。"
-#. i18n: file lookandfeeltab.ui line 477
-#: rc.cpp:357
+#. i18n: file lookandfeeltab.ui line 488
+#: rc.cpp:390
#, no-c-format
msgid "Enable &background image"
msgstr "启用背景图像(&B)"
-#. i18n: file lookandfeeltab.ui line 485
-#: rc.cpp:360
+#. i18n: file lookandfeeltab.ui line 496
+#: rc.cpp:393
#, no-c-format
msgid "Enable &transparency"
msgstr "允许透明(&T)"
-#. i18n: file lookandfeeltab.ui line 503
-#: rc.cpp:363
+#. i18n: file lookandfeeltab.ui line 514
+#: rc.cpp:396
#, no-c-format
msgid "Advanc&ed Options"
msgstr "高级选项(&E)"
-#. i18n: file lookandfeeltab.ui line 506
-#: rc.cpp:366
+#. i18n: file lookandfeeltab.ui line 517
+#: rc.cpp:399
#, no-c-format
msgid ""
"Click here to open the Advanced Options dialog. You can configure the applet "
"handles look and feel, the tint transparency color and more."
msgstr "点击此处打开高级选项对话框。您可以配置小程序把手的观感、透明染色等选项。"
-#. i18n: file menutab.ui line 27
-#: rc.cpp:369
+#. i18n: file menutab.ui line 35
+#: rc.cpp:402
+#, fuzzy, no-c-format
+msgid "TDE menu style:"
+msgstr "&K 菜单:"
+
+#. i18n: file menutab.ui line 44
+#: rc.cpp:405
+#, no-c-format
+msgid "Kickoff"
+msgstr ""
+
+#. i18n: file menutab.ui line 49
+#: rc.cpp:408
+#, no-c-format
+msgid "Trinity Classic"
+msgstr ""
+
+#. i18n: file menutab.ui line 80
+#: rc.cpp:411
#, no-c-format
msgid "TDE Menu"
msgstr "K 菜单"
-#. i18n: file menutab.ui line 49
-#: rc.cpp:372
+#. i18n: file menutab.ui line 102
+#: rc.cpp:414
#, no-c-format
msgid "Menu item format:"
msgstr "菜单项格式:"
-#. i18n: file menutab.ui line 55
-#: rc.cpp:375
+#. i18n: file menutab.ui line 108
+#: rc.cpp:417
#, no-c-format
msgid "Here you can choose how menu entries are shown."
msgstr "您可在此选择菜单项显示的方式。"
-#. i18n: file menutab.ui line 66
-#: rc.cpp:378
+#. i18n: file menutab.ui line 119
+#: rc.cpp:420
#, no-c-format
msgid "&Name only"
msgstr "只有名称(&N)"
-#. i18n: file menutab.ui line 69
-#: rc.cpp:381
+#. i18n: file menutab.ui line 122
+#: rc.cpp:423
#, no-c-format
msgid ""
"When this option is selected, items in the TDE Menu will appear with the "
"application's name next to the icon."
msgstr "如果选中此项,K 菜单上各项图标旁边将只显示其名称。"
-#. i18n: file menutab.ui line 77
-#: rc.cpp:384
+#. i18n: file menutab.ui line 130
+#: rc.cpp:426
#, no-c-format
msgid "Name - &Description"
msgstr "名称 - 描述(&D)"
-#. i18n: file menutab.ui line 83
-#: rc.cpp:387
+#. i18n: file menutab.ui line 136
+#: rc.cpp:429
#, no-c-format
msgid ""
"When this option is selected, items in the TDE Menu will appear with the "
"application's name and a brief description next to the icon."
msgstr "如果选中此项,K 菜单上各项图标旁边将显示其名称及其简短描述。"
-#. i18n: file menutab.ui line 91
-#: rc.cpp:390
+#. i18n: file menutab.ui line 144
+#: rc.cpp:432
#, no-c-format
msgid "D&escription only"
msgstr "只有描述(&E)"
-#. i18n: file menutab.ui line 94
-#: rc.cpp:393
+#. i18n: file menutab.ui line 147
+#: rc.cpp:435
#, no-c-format
msgid ""
"When this option is selected, items in the TDE Menu will appear with the "
"application's brief description next to the icon."
msgstr "如果选中此项,K 菜单上各项图标旁边将只显示应用程序的简短描述。"
-#. i18n: file menutab.ui line 105
-#: rc.cpp:396
+#. i18n: file menutab.ui line 158
+#: rc.cpp:438
#, no-c-format
msgid "Des&cription (Name)"
msgstr "描述(名称)(&C)"
-#. i18n: file menutab.ui line 108
-#: rc.cpp:399
+#. i18n: file menutab.ui line 161
+#: rc.cpp:441
#, no-c-format
msgid ""
"When this option is selected, items in the TDE Menu will appear with a brief "
"description and the application's name in brackets next to the icon."
msgstr "如果选中此项,K 菜单上各项图标旁边将显示其描述,并在括号里附加其名称。"
-#. i18n: file menutab.ui line 118
-#: rc.cpp:402
+#. i18n: file menutab.ui line 171
+#: rc.cpp:444
+#, no-c-format
+msgid "Edit &TDE Menu"
+msgstr "编辑 &K 菜单"
+
+#. i18n: file menutab.ui line 174
+#: rc.cpp:447
+#, fuzzy, no-c-format
+msgid ""
+"Start the editor for the TDE Menu. Here you can add, edit, remove and hide "
+"applications."
+msgstr "启动 K 菜单的编辑器。您可在此添加、编辑、删除和隐藏应用程序。"
+
+#. i18n: file menutab.ui line 182
+#: rc.cpp:450
+#, no-c-format
+msgid "Change menu icon"
+msgstr ""
+
+#. i18n: file menutab.ui line 185
+#: rc.cpp:453
+#, fuzzy, no-c-format
+msgid "Allows you to choose a different icon for the TDE menu."
+msgstr "为 K 菜单选择一个平铺图像。"
+
+#. i18n: file menutab.ui line 213
+#: rc.cpp:456
+#, no-c-format
+msgid "Optional Menus"
+msgstr "可选菜单"
+
+#. i18n: file menutab.ui line 243
+#: rc.cpp:459
+#, no-c-format
+msgid ""
+"This is a list of the dynamic menus that can be displayed in the TDE menu in "
+"addition to the normal applications. Use the checkboxes to add or remove menus."
+msgstr "这里列出的是可以添加到 TDE 菜单上的动态菜单。用复选框添加或删除这些菜单。"
+
+#. i18n: file menutab.ui line 256
+#: rc.cpp:462
+#, no-c-format
+msgid "Open menu on mouse hover"
+msgstr ""
+
+#. i18n: file menutab.ui line 264
+#: rc.cpp:465
+#, fuzzy, no-c-format
+msgid "Show T&ooltip"
+msgstr "显示工具提示(&L)"
+
+#. i18n: file menutab.ui line 270
+#: rc.cpp:468
+#, no-c-format
+msgid ""
+"<qt>When this option is selected, a tooltip appears when hovering the mouse "
+"pointer over Application Launcher Menu items. Enabling this option also "
+"requires that tooltips are enabled in the Panels->Appearance configuration "
+"dialog."
+msgstr ""
+
+#. i18n: file menutab.ui line 278
+#: rc.cpp:471
#, no-c-format
msgid "Show side ima&ge"
msgstr "显示旁边的图像(&G)"
-#. i18n: file menutab.ui line 126
-#: rc.cpp:405
-#, no-c-format
+#. i18n: file menutab.ui line 286
+#: rc.cpp:474
+#, fuzzy, no-c-format
msgid ""
"<qt>When this option is selected an image will appear down the left-hand side "
"of the TDE Menu. The image will be tinted according to your color settings.\n"
-" \n"
-" "
+"\t\t\t\t\t\t\t\t\n"
+"\t\t\t\t\t\t\t\t"
"<p><b>Tip</b>: You can customize the image that appears in the TDE Menu by "
"putting an image file called kside.png and a tileable image file called "
"kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt>"
@@ -1011,48 +1169,46 @@ msgstr ""
"<p><b>提示</b>:您可以自定义出现在 K 菜单上的图像,只需在 $TDEHOME/share/apps/kicker/pics 目录下放一个名为 "
"kside.png 的图片文件和一个名为 kside_title.png 的可拼接图案文件。</qt>"
-#. i18n: file menutab.ui line 151
-#: rc.cpp:410
+#. i18n: file menutab.ui line 294
+#: rc.cpp:479
#, no-c-format
-msgid "Edit &TDE Menu"
-msgstr "编辑 &K 菜单"
+msgid "Display text in menu button"
+msgstr ""
-#. i18n: file menutab.ui line 154
-#: rc.cpp:413
-#, no-c-format
+#. i18n: file menutab.ui line 300
+#: rc.cpp:482
+#, fuzzy, no-c-format
msgid ""
-"Start the editor for the TDE menu. Here you can add, edit, remove and hide "
-"applications."
-msgstr "启动 K 菜单的编辑器。您可在此添加、编辑、删除和隐藏应用程序。"
+"<qt>When this option is selected the text below will be shown in the TDE Menu "
+"button."
+msgstr "如果选中此项,K 菜单上各项图标旁边将只显示其名称。"
-#. i18n: file menutab.ui line 162
-#: rc.cpp:416
+#. i18n: file menutab.ui line 323
+#: rc.cpp:485
#, no-c-format
-msgid "Optional Menus"
-msgstr "可选菜单"
+msgid "Text:"
+msgstr ""
-#. i18n: file menutab.ui line 192
-#: rc.cpp:419
+#. i18n: file menutab.ui line 347
+#: rc.cpp:488
#, no-c-format
-msgid ""
-"This is a list of the dynamic menus that can be displayed in the TDE menu in "
-"addition to the normal applications. Use the checkboxes to add or remove menus."
-msgstr "这里列出的是可以添加到 TDE 菜单上的动态菜单。用复选框添加或删除这些菜单。"
+msgid "Font:"
+msgstr ""
-#. i18n: file menutab.ui line 202
-#: rc.cpp:422
+#. i18n: file menutab.ui line 406
+#: rc.cpp:491
#, no-c-format
msgid "QuickBrowser Menus"
msgstr "快捷浏览菜单"
-#. i18n: file menutab.ui line 221
-#: rc.cpp:425
+#. i18n: file menutab.ui line 425
+#: rc.cpp:494 rc.cpp:512
#, no-c-format
msgid "Ma&ximum number of entries:"
msgstr "最大菜单项数(&X):"
-#. i18n: file menutab.ui line 227
-#: rc.cpp:428 rc.cpp:431
+#. i18n: file menutab.ui line 431
+#: rc.cpp:497 rc.cpp:500
#, no-c-format
msgid ""
"When browsing directories that contain a lot of files, the QuickBrowser can "
@@ -1061,78 +1217,112 @@ msgid ""
"resolutions."
msgstr "当浏览有很多文件的目录的时候,快捷浏览菜单有时会盖满您整个桌面。您可以限制快捷浏览同时可以显示的项目数。这在低分辨率下特别有用。"
-#. i18n: file menutab.ui line 254
-#: rc.cpp:434
+#. i18n: file menutab.ui line 458
+#: rc.cpp:503
#, no-c-format
msgid "Show hidden fi&les"
msgstr "显示隐藏文件(&L)"
-#. i18n: file menutab.ui line 260
-#: rc.cpp:437
+#. i18n: file menutab.ui line 464
+#: rc.cpp:506
#, no-c-format
msgid ""
"If this option is enabled, hidden files (i.e. files beginning with a dot) will "
"be shown in the QuickBrowser menus."
msgstr "如果启用这个选项,隐藏文件(即以 . 为文件名开始的文件)将在快捷浏览菜单中显示。"
-#. i18n: file menutab.ui line 287
-#: rc.cpp:440
+#. i18n: file menutab.ui line 491
+#: rc.cpp:509
+#, no-c-format
+msgid "Recent Documents Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 516
+#: rc.cpp:515 rc.cpp:518
+#, no-c-format
+msgid ""
+"This sets the maximum number of recently accessed documents stored for fast "
+"retrieval."
+msgstr ""
+
+#. i18n: file menutab.ui line 562
+#: rc.cpp:521
#, no-c-format
msgid "QuickStart Menu Items"
msgstr "快速启动菜单项"
-#. i18n: file menutab.ui line 306
-#: rc.cpp:443
+#. i18n: file menutab.ui line 581
+#: rc.cpp:524
#, no-c-format
msgid "Maxim&um number of entries:"
msgstr "最多菜单项数(&U):"
-#. i18n: file menutab.ui line 312
-#: rc.cpp:446
+#. i18n: file menutab.ui line 587
+#: rc.cpp:527
#, no-c-format
msgid ""
"This option allows you to define the maximum number of applications that should "
"be displayed in the QuickStart menu area."
msgstr "此选项让您能指定快速启动菜单区显示的最多程序个数。"
-#. i18n: file menutab.ui line 329
-#: rc.cpp:449
+#. i18n: file menutab.ui line 604
+#: rc.cpp:530
#, no-c-format
msgid ""
"This option allows you to define how many applications should be displayed at "
"most in the QuickStart menu area."
msgstr "此选项让您能指定快速启动菜单区显示的最多程序个数。"
-#. i18n: file menutab.ui line 339
-#: rc.cpp:452
+#. i18n: file menutab.ui line 614
+#: rc.cpp:533
#, no-c-format
msgid "Show the &applications most recently used"
msgstr "显示最近使用过的程序(&A)"
-#. i18n: file menutab.ui line 345
-#: rc.cpp:455
+#. i18n: file menutab.ui line 620
+#: rc.cpp:536
#, no-c-format
msgid ""
"When this option is selected the QuickStart menu area will be filled with the "
"applications you have used most recently."
msgstr "选中此选项,快速启动菜单区将会包括您最近使用过的程序。"
-#. i18n: file menutab.ui line 353
-#: rc.cpp:458
+#. i18n: file menutab.ui line 628
+#: rc.cpp:539
#, no-c-format
msgid "Show the applications most fre&quently used"
msgstr "显示使用次数最多的程序(&Q)"
-#. i18n: file menutab.ui line 356
-#: rc.cpp:461
+#. i18n: file menutab.ui line 631
+#: rc.cpp:542
#, no-c-format
msgid ""
"When this option is selected the QuickStart menu area will be filled with the "
"applications you use most frequently."
msgstr "选中此选项,快速启动菜单区将会包括您最经常使用的程序。"
+#. i18n: file menutab.ui line 658
+#: rc.cpp:545
+#, fuzzy, no-c-format
+msgid "TDE Menu Search"
+msgstr "K 菜单"
+
+#. i18n: file menutab.ui line 669
+#: rc.cpp:548
+#, no-c-format
+msgid "Show search field in TDE Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 675
+#: rc.cpp:551
+#, fuzzy, no-c-format
+msgid ""
+"<qt>When this option is selected a text-based search field will appear in the "
+"TDE Menu.</qt>"
+msgstr "选中此项时,面板条左端将出现一个隐藏按钮。"
+
#. i18n: file positiontab.ui line 17
-#: rc.cpp:464
+#: rc.cpp:554
#, no-c-format
msgid ""
"This is a list of all the panels currently active on your desktop. Select one "
@@ -1140,13 +1330,13 @@ msgid ""
msgstr "这里列出的是您的系统当前用到的所有面板。请选择一个进行配置。"
#. i18n: file positiontab.ui line 83
-#: rc.cpp:470
+#: rc.cpp:560
#, no-c-format
msgid "Screen"
msgstr "屏幕"
#. i18n: file positiontab.ui line 139
-#: rc.cpp:473
+#: rc.cpp:563
#, no-c-format
msgid ""
"This preview image shows how the panel will appear on your screen with the "
@@ -1156,25 +1346,25 @@ msgid ""
msgstr "这个预览图像显示了在您所选的设置下面板是如何出现在屏幕上的。点击图案周围的按钮将改变面板的位置,移动长度滑杆和选择不同大小将改变面板的尺寸。"
#. i18n: file positiontab.ui line 191
-#: rc.cpp:476
+#: rc.cpp:566
#, no-c-format
msgid "Identify"
msgstr "标识"
#. i18n: file positiontab.ui line 194
-#: rc.cpp:479
+#: rc.cpp:569
#, no-c-format
msgid "This button displays each monitor's identifying number"
msgstr "此按钮显示每个显示器的标识号码"
#. i18n: file positiontab.ui line 212
-#: rc.cpp:482
+#: rc.cpp:572
#, no-c-format
msgid "&Xinerama screen:"
msgstr "&Xinerama 屏幕:"
#. i18n: file positiontab.ui line 223
-#: rc.cpp:485
+#: rc.cpp:575
#, no-c-format
msgid ""
"This menu selects which screen the Panel will be displayed on in a "
@@ -1182,13 +1372,13 @@ msgid ""
msgstr "这个菜单选择多显示器系统中,面板将在哪个屏幕上显示"
#. i18n: file positiontab.ui line 260
-#: rc.cpp:488
+#: rc.cpp:578
#, no-c-format
msgid "Len&gth"
msgstr "长度(&G)"
#. i18n: file positiontab.ui line 264
-#: rc.cpp:491
+#: rc.cpp:581
#, no-c-format
msgid ""
"This group of settings determines how the panel is aligned, including\n"
@@ -1196,7 +1386,7 @@ msgid ""
msgstr "这组选项决定了面板在屏幕上将如何对齐、放置在何处、以及使用多大部分的屏幕。"
#. i18n: file positiontab.ui line 312
-#: rc.cpp:495
+#: rc.cpp:585
#, no-c-format
msgid ""
"This slider defines how much of the screen's edge will be occupied by the "
@@ -1204,13 +1394,13 @@ msgid ""
msgstr "这个滑动杆控制屏幕边上多长的部分被面板占用。"
#. i18n: file positiontab.ui line 329
-#: rc.cpp:498
+#: rc.cpp:588
#, no-c-format
msgid "%"
msgstr "%"
#. i18n: file positiontab.ui line 332
-#: rc.cpp:501
+#: rc.cpp:591
#, no-c-format
msgid ""
"This spinbox defines how much of the screen's edge will be occupied by the "
@@ -1218,13 +1408,13 @@ msgid ""
msgstr "这个滚轮控制屏幕边上多长的部分被面板占用。"
#. i18n: file positiontab.ui line 342
-#: rc.cpp:504
+#: rc.cpp:594
#, no-c-format
msgid "&Expand as required to fit contents"
msgstr "自动扩大到需要的尺寸(&E)"
#. i18n: file positiontab.ui line 345
-#: rc.cpp:507
+#: rc.cpp:597
#, no-c-format
msgid ""
"When this option is selected, the panel will grow as necessary to accommodate "
@@ -1232,61 +1422,61 @@ msgid ""
msgstr "如果选中此选项,面板尺寸将按照需要,扩大到可以容纳它上面的全部按钮和小程序。"
#. i18n: file positiontab.ui line 380
-#: rc.cpp:510
+#: rc.cpp:600
#, no-c-format
msgid "Si&ze"
msgstr "大小(&Z)"
#. i18n: file positiontab.ui line 383
-#: rc.cpp:513
+#: rc.cpp:603
#, no-c-format
msgid "This sets the size of the panel."
msgstr "这将设置面板的大小。"
#. i18n: file positiontab.ui line 392
-#: rc.cpp:516
+#: rc.cpp:606
#, no-c-format
msgid "Tiny"
msgstr "极小"
#. i18n: file positiontab.ui line 397
-#: rc.cpp:519
+#: rc.cpp:609
#, no-c-format
msgid "Small"
msgstr "小"
#. i18n: file positiontab.ui line 402
-#: rc.cpp:522
+#: rc.cpp:612
#, no-c-format
msgid "Normal"
msgstr "正常"
#. i18n: file positiontab.ui line 407
-#: rc.cpp:525
+#: rc.cpp:615
#, no-c-format
msgid "Large"
msgstr "大"
#. i18n: file positiontab.ui line 484
-#: rc.cpp:531
+#: rc.cpp:621
#, no-c-format
msgid "This slider defines the panel size when the Custom option is selected."
msgstr "当使用自定义选项时,这个滑动杆指定面板的高度。"
#. i18n: file positiontab.ui line 507
-#: rc.cpp:537
+#: rc.cpp:627
#, no-c-format
msgid "This spinbox defines the panel size when the Custom option is selected."
msgstr "当使用自定义选项时,这个滚轮指定面板的高度。"
#. i18n: file positiontab.ui line 519
-#: rc.cpp:540
+#: rc.cpp:630
#, no-c-format
msgid "Position"
msgstr "位置"
#. i18n: file positiontab.ui line 525
-#: rc.cpp:543
+#: rc.cpp:633
#, no-c-format
msgid ""
"Here you can set the position of the panel highlighted on the left side. You "
@@ -1297,142 +1487,143 @@ msgstr ""
"您可在此设置左侧突出显示的面板所在的位置。您可以将任何面板放在屏幕的上边、下边、左边、右边。而且,您可以将其放在一边的中间,也可以放在屏幕的一角。"
#. i18n: file positiontab.ui line 609
-#: rc.cpp:546
+#: rc.cpp:636
#, no-c-format
msgid "Alt+1"
msgstr "Alt+1"
#. i18n: file positiontab.ui line 643
-#: rc.cpp:549
+#: rc.cpp:639
#, no-c-format
msgid "Alt+2"
msgstr "Alt+2"
#. i18n: file positiontab.ui line 677
-#: rc.cpp:552
+#: rc.cpp:642
#, no-c-format
msgid "Alt+3"
msgstr "Alt+3"
#. i18n: file positiontab.ui line 721
-#: rc.cpp:555
+#: rc.cpp:645
#, no-c-format
msgid "Alt+="
msgstr "Alt+="
#. i18n: file positiontab.ui line 755
-#: rc.cpp:558
+#: rc.cpp:648
#, no-c-format
msgid "Alt+-"
msgstr "Alt+-"
#. i18n: file positiontab.ui line 789
-#: rc.cpp:561
+#: rc.cpp:651
#, no-c-format
msgid "Alt+0"
msgstr "Alt+0"
#. i18n: file positiontab.ui line 833
-#: rc.cpp:564
+#: rc.cpp:654
#, no-c-format
msgid "Alt+9"
msgstr "Alt+9"
#. i18n: file positiontab.ui line 867
-#: rc.cpp:567
+#: rc.cpp:657
#, no-c-format
msgid "Alt+8"
msgstr "Alt+8"
#. i18n: file positiontab.ui line 901
-#: rc.cpp:570
+#: rc.cpp:660
#, no-c-format
msgid "Alt+7"
msgstr "Alt+7"
#. i18n: file positiontab.ui line 945
-#: rc.cpp:573
+#: rc.cpp:663
#, no-c-format
msgid "Alt+4"
msgstr "Alt+4"
#. i18n: file positiontab.ui line 979
-#: rc.cpp:576
+#: rc.cpp:666
#, no-c-format
msgid "Alt+5"
msgstr "Alt+5"
#. i18n: file positiontab.ui line 1013
-#: rc.cpp:579
+#: rc.cpp:669
#, no-c-format
msgid "Alt+6"
msgstr "Alt+6"
-#: rc.cpp:580
-msgid "TDE Button"
+#: rc.cpp:670
+#, fuzzy
+msgid "KDE Button"
msgstr "TDE 按钮"
-#: rc.cpp:581
+#: rc.cpp:671
msgid "Blue Wood"
msgstr "蓝木纹"
-#: rc.cpp:582
+#: rc.cpp:672
msgid "Green Wood"
msgstr "绿木纹"
-#: rc.cpp:583
+#: rc.cpp:673
msgid "Light Gray"
msgstr "淡灰"
-#: rc.cpp:584
+#: rc.cpp:674
msgid "Light Green"
msgstr "淡绿"
-#: rc.cpp:585
+#: rc.cpp:675
msgid "Light Pastel"
msgstr "淡彩蜡笔画"
-#: rc.cpp:586
+#: rc.cpp:676
msgid "Light Purple"
msgstr "淡紫"
-#: rc.cpp:587
+#: rc.cpp:677
msgid "Nuts And Bolts"
msgstr "螺母和螺栓"
-#: rc.cpp:588
+#: rc.cpp:678
msgid "Red Wood"
msgstr "红木纹"
-#: rc.cpp:589
+#: rc.cpp:679
msgid "Solid Blue"
msgstr "蓝色"
-#: rc.cpp:590
+#: rc.cpp:680
msgid "Solid Gray"
msgstr "灰色"
-#: rc.cpp:591
+#: rc.cpp:681
msgid "Solid Green"
msgstr "绿色"
-#: rc.cpp:592
+#: rc.cpp:682
msgid "Solid Orange"
msgstr "桔黄"
-#: rc.cpp:593
+#: rc.cpp:683
msgid "Solid Pastel"
msgstr "蜡笔画"
-#: rc.cpp:594
+#: rc.cpp:684
msgid "Solid Purple"
msgstr "紫色"
-#: rc.cpp:595
+#: rc.cpp:685
msgid "Solid Red"
msgstr "红色"
-#: rc.cpp:596
+#: rc.cpp:686
msgid "Solid Tigereye"
msgstr "虎眼石"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
index a167947fe7d..6354156affd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-06-08 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-05-06 17:41+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -50,55 +51,67 @@ msgid ""
msgstr "使用该选项将把所有网络文件传输的进度信息组织到一个窗口中的列表中。当不使用该选项时,全部传输在各个窗口中显示。"
#: behaviour.cpp:85
+msgid "Show archived &files as folders"
+msgstr ""
+
+#: behaviour.cpp:88
+#, fuzzy
+msgid ""
+"Checking this option will list archived files as folders when using tree view."
+msgstr "选中此选项将点击图标名称直接对文件改名。"
+
+#: behaviour.cpp:94
msgid "Show file &tips"
msgstr "显示文件提示(&T)"
-#: behaviour.cpp:88
+#: behaviour.cpp:97
+#, fuzzy
msgid ""
"Here you can control if, when moving the mouse over a file, you want to see a "
-"small popup window with additional information about that file"
+"small popup window with additional information about that file.This feature "
+"requires 'Enable tooltips' in KControl, Appearance & Themes, Style."
msgstr "这样您能控制它,当在文件上移动鼠标时,您能看到一个关于那个文件的额外信息的小的弹出窗口。"
-#: behaviour.cpp:108
+#: behaviour.cpp:118
msgid "Show &previews in file tips"
msgstr "在文件提示中显示预览(&P)"
-#: behaviour.cpp:111
+#: behaviour.cpp:121
msgid ""
"Here you can control if you want the popup window to contain a larger preview "
"for the file, when moving the mouse over it."
msgstr "您可以在这里控制当鼠标指向文件时,弹出窗口中是否要显示文件的较大预览。"
-#: behaviour.cpp:114
+#: behaviour.cpp:124
msgid "Rename icons in&line"
msgstr "内嵌式重命名图标(&L)"
-#: behaviour.cpp:115
+#: behaviour.cpp:125
msgid ""
"Checking this option will allow files to be renamed by clicking directly on the "
"icon name. "
msgstr "选中此选项将点击图标名称直接对文件改名。"
-#: behaviour.cpp:121
+#: behaviour.cpp:131
msgid "Home &URL:"
msgstr "主 &URL:"
-#: behaviour.cpp:126
+#: behaviour.cpp:136
msgid "Select Home Folder"
msgstr "选择主文件夹"
-#: behaviour.cpp:131
+#: behaviour.cpp:141
msgid ""
"This is the URL (e.g. a folder or a web page) where Konqueror will jump to when "
"the \"Home\" button is pressed. This is usually your home folder, symbolized by "
"a 'tilde' (~)."
msgstr "当“主文件夹”按钮按下时,Konqueror 将打开该 URL (文件夹或网页)。这通常是您的主文件夹,由波浪号 ~ 代表。"
-#: behaviour.cpp:139
+#: behaviour.cpp:149
msgid "Show 'Delete' context me&nu entries which bypass the trashcan"
msgstr "显示跳过回收站的“删除”快捷菜单项(&N)"
-#: behaviour.cpp:143
+#: behaviour.cpp:153
msgid ""
"Check this if you want 'Delete' menu commands to be displayed on the desktop "
"and in the file manager's context menus. You can always delete files by holding "
@@ -107,11 +120,11 @@ msgstr ""
"如果您想在桌面和文件管理器的菜单和快捷菜单中显示“删除”菜单命令,请选中此选项。如果您想要彻底删除文件,您总是可以在调用“移到回收站”命令时按住 Shift "
"键。"
-#: behaviour.cpp:148
+#: behaviour.cpp:158
msgid "Ask Confirmation For"
msgstr "要求确认"
-#: behaviour.cpp:150
+#: behaviour.cpp:160
msgid ""
"This option tells Konqueror whether to ask for a confirmation when you "
"\"delete\" a file. "
@@ -125,11 +138,11 @@ msgstr ""
"<li><em>移到回收站:</em>移动文件到您的回收目录中, 您可从这里轻松恢复文件。</li> "
"<li><em>删除:</em>简单删除文件。</li></ul>"
-#: behaviour.cpp:159
+#: behaviour.cpp:169
msgid "&Move to trash"
msgstr "移到回收站(&M)"
-#: behaviour.cpp:161
+#: behaviour.cpp:171
msgid "D&elete"
msgstr "删除(&E)"
@@ -191,27 +204,28 @@ msgstr "桌面 %1"
msgid "Sound Files"
msgstr "声音文件"
-#: desktopbehavior_impl.cpp:136
+#: desktopbehavior_impl.cpp:137
msgid "&Left button:"
msgstr "左键(&L):"
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:138
msgid ""
"You can choose what happens when you click the left button of your pointing "
"device on the desktop:"
msgstr "您可以选择在桌面上点击定点设备左按钮时的动作:"
-#: desktopbehavior_impl.cpp:140
+#: desktopbehavior_impl.cpp:141
msgid "Right b&utton:"
msgstr "右键(&U):"
-#: desktopbehavior_impl.cpp:141
+#: desktopbehavior_impl.cpp:142
msgid ""
"You can choose what happens when you click the right button of your pointing "
"device on the desktop:"
msgstr "您可以选择在桌面上点击指点设备右按钮时的动作:"
-#: desktopbehavior_impl.cpp:157 desktopbehavior_impl.cpp:203
+#: desktopbehavior_impl.cpp:158 desktopbehavior_impl.cpp:204
+#, fuzzy
msgid ""
" "
"<ul>"
@@ -224,8 +238,8 @@ msgid ""
"<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
"things, this menu has options for configuring the display, locking the screen, "
"and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
"\"Kicker\") hidden from view.</li></ul>"
msgstr ""
"<ul>"
@@ -235,7 +249,8 @@ msgstr ""
"<li><em>桌面菜单:</em>桌面的上下文菜单。该菜单包括了屏幕显示、屏幕锁定、退出TDE的选项。</li>"
"<li><em>应用程序菜单:</em>“Kicker”菜单。快速访问应用程序。</li></ul>"
-#: desktopbehavior_impl.cpp:178
+#: desktopbehavior_impl.cpp:179
+#, fuzzy
msgid ""
"You can choose what happens when you click the middle button of your pointing "
"device on the desktop: "
@@ -249,8 +264,8 @@ msgid ""
"<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
"things, this menu has options for configuring the display, locking the screen, "
"and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
"\"Kicker\") hidden from view.</li></ul>"
msgstr ""
"选择当按鼠标中键点击桌面上的设备图标所要发生的事件:"
@@ -261,35 +276,35 @@ msgstr ""
"<li><em>桌面菜单:</em>桌面的上下文菜单。该菜单包括了屏幕显示、屏幕锁定、退出TDE的选项。</li>"
"<li><em>应用程序菜单:</em>“Kicker”菜单。快速访问应用程序。</li></ul>"
-#: desktopbehavior_impl.cpp:269
+#: desktopbehavior_impl.cpp:290
msgid "No Action"
msgstr "无动作"
-#: desktopbehavior_impl.cpp:270
+#: desktopbehavior_impl.cpp:291
msgid "Window List Menu"
msgstr "窗口列表菜单"
-#: desktopbehavior_impl.cpp:271
+#: desktopbehavior_impl.cpp:292
msgid "Desktop Menu"
msgstr "桌面菜单"
-#: desktopbehavior_impl.cpp:272
+#: desktopbehavior_impl.cpp:293
msgid "Application Menu"
msgstr "应用程序菜单"
-#: desktopbehavior_impl.cpp:273
+#: desktopbehavior_impl.cpp:294
msgid "Bookmarks Menu"
msgstr "书签菜单"
-#: desktopbehavior_impl.cpp:274
+#: desktopbehavior_impl.cpp:295
msgid "Custom Menu 1"
msgstr "自定义菜单 1"
-#: desktopbehavior_impl.cpp:275
+#: desktopbehavior_impl.cpp:296
msgid "Custom Menu 2"
msgstr "自定义菜单 2"
-#: desktopbehavior_impl.cpp:458
+#: desktopbehavior_impl.cpp:480
msgid ""
"<h1>Behavior</h1>\n"
"This module allows you to choose various options\n"
@@ -401,17 +416,18 @@ msgid ""
msgstr "<p>在下列协议上允许预览、“文件夹图标反映内容”及获取摘要数据:</p>"
#: previews.cpp:68
+#, fuzzy
msgid ""
"<h1>Preview Options</h1> Here you can modify the behavior of Konqueror when it "
"shows the files in a folder."
-"<h2>The list of protocols:</h2> check the protocols over which previews should "
+"<h2>The list of protocols:</h2> Check the protocols over which previews should "
"be shown; uncheck those over which they should not. For instance, you might "
"want to show previews over SMB if the local network is fast enough, but you "
"might disable it for FTP if you often visit very slow FTP sites with large "
"images."
-"<h2>Maximum File Size:</h2> select the maximum file size for which previews "
-"should be generated. For instance, if set to 1 MB (the default), no preview "
-"will be generated for files bigger than 1 MB, for speed reasons."
+"<h2>Maximum File Size:</h2> Select the maximum file size for which previews "
+"should be generated. For instance, if set to 10 MB (the default), no preview "
+"will be generated for files bigger than 10 MB, for speed reasons."
msgstr ""
"<h1>预览选项</h1>您可以在这里修改 Konqueror 在文件夹中显示文件的行为。"
"<h2>协议列表</h2>:选中应该被预览的协议,不选那些不应预览的协议。比如,假如本地网络足够快,您可能想 SMB "
@@ -653,18 +669,24 @@ msgstr "设备图标"
#. i18n: file desktopbehavior.ui line 373
#: rc.cpp:88
-#, no-c-format
-msgid "&Show device icons:"
+#, fuzzy, no-c-format
+msgid "&Show device icons"
msgstr "显示设备图标(&S):"
-#. i18n: file desktopbehavior.ui line 379
+#. i18n: file desktopbehavior.ui line 381
#: rc.cpp:91
+#, fuzzy, no-c-format
+msgid "&Show free space overlay on device icons"
+msgstr "显示设备图标(&S):"
+
+#. i18n: file desktopbehavior.ui line 387
+#: rc.cpp:94
#, no-c-format
msgid "Device Types to Display"
msgstr "要显示的设备类型"
-#. i18n: file desktopbehavior.ui line 398
-#: rc.cpp:94
+#. i18n: file desktopbehavior.ui line 406
+#: rc.cpp:97
#, no-c-format
msgid "Deselect the device types which you do not want to see on the desktop."
msgstr "不要选择那些您不想在桌面上出现的设备。"
@@ -712,15 +734,77 @@ msgid ""
"This folder will be used by default to load or save documents from or to."
msgstr "该文件夹默认将被用来载入或保存文档。"
-#: rootopts.cpp:202 rootopts.cpp:217
+#: rootopts.cpp:117
+#, fuzzy
+msgid "Download path:"
+msgstr "文档路径(&O):"
+
+#: rootopts.cpp:124
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save downloads from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:129
+msgid "Music path:"
+msgstr ""
+
+#: rootopts.cpp:136
+#, fuzzy
+msgid "This folder will be used by default to load or save music from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:141
+#, fuzzy
+msgid "Pictures path:"
+msgstr "文档路径(&O):"
+
+#: rootopts.cpp:148
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save pictures from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:153
+msgid "Public Share path:"
+msgstr ""
+
+#: rootopts.cpp:160
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save public shared files from or "
+"to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:165
+msgid "Templates path:"
+msgstr ""
+
+#: rootopts.cpp:172
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save templates from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:177
+#, fuzzy
+msgid "Videos path:"
+msgstr "桌面路径(&K):"
+
+#: rootopts.cpp:184
+#, fuzzy
+msgid "This folder will be used by default to load or save videos from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:312 rootopts.cpp:326
msgid "Autostart"
msgstr "自动启动"
-#: rootopts.cpp:206
+#: rootopts.cpp:316
msgid "Desktop"
msgstr "桌面"
-#: rootopts.cpp:275
+#: rootopts.cpp:512
msgid ""
"The path for '%1' has been changed;\n"
"do you want the files to be moved from '%2' to '%3'?"
@@ -728,6 +812,6 @@ msgstr ""
"“%1”的路径已经更改;\n"
"您要把文件从“%2”移到“%3”吗?"
-#: rootopts.cpp:276
+#: rootopts.cpp:513
msgid "Confirmation Required"
msgstr "请求确认"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
index b3dc3ff988e..09a3d3e7de5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-10-22 01:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:49+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,10 +30,6 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: advancedTabDialog.cpp:39 htmlopts.cpp:98
-msgid "Advanced Options"
-msgstr "高级选项"
-
#: appearance.cpp:33
msgid ""
"<h1>Konqueror Fonts</h1>On this page, you can configure which fonts Konqueror "
@@ -258,7 +255,7 @@ msgstr ""
"<h1>Konqueror AdBlocK</h1>Konqueror AdBlocK 允许您创建一组过滤器列表,而 Konqueror "
"将会把这些过滤器应用到链接的图像和框架上。匹配的 URL 将被忽略,或者替换为占位图像。"
-#: htmlopts.cpp:41
+#: htmlopts.cpp:45
msgid ""
"<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser "
"functionality. Please note that the file manager functionality has to be "
@@ -270,117 +267,94 @@ msgstr ""
"的浏览器功能。请注意,文件管理器的功能是在“文件管理器”配置模块中配置的。您可以设置 Konqueror 在装入网页时如何处理其中的 HTML "
"代码。通常不必更改这里的全部设置。"
-#: htmlopts.cpp:49
+#: htmlopts.cpp:53
msgid "Boo&kmarks"
msgstr "书签(&K)"
-#: htmlopts.cpp:50
+#: htmlopts.cpp:54
msgid "Ask for name and folder when adding bookmarks"
msgstr "添加书签时询问名称和文件夹"
-#: htmlopts.cpp:51
+#: htmlopts.cpp:55
msgid ""
"If this box is checked, Konqueror will allow you to change the title of the "
"bookmark and choose a folder in which to store it when you add a new bookmark."
msgstr "若选中了此框,Konqueror 将会允许您添加新书签时更改书签的标题并选择书签所在的文件夹。"
-#: htmlopts.cpp:55
+#: htmlopts.cpp:59
msgid "Show only marked bookmarks in bookmark toolbar"
msgstr "只在书签工具栏中显示打标记的书签"
-#: htmlopts.cpp:56
+#: htmlopts.cpp:60
msgid ""
"If this box is checked, Konqueror will show only those bookmarks in the "
"bookmark toolbar which you have marked to do so in the bookmark editor."
msgstr "若选中了此框,Konqueror 将只会书签工具栏中显示您在书签编辑器中打了标记的那些书签。"
-#: htmlopts.cpp:65
+#: htmlopts.cpp:69
msgid "Form Com&pletion"
msgstr "表单补全(&P)"
-#: htmlopts.cpp:66
-msgid "Enable completion of &forms"
+#: htmlopts.cpp:70
+#, fuzzy
+msgid "Enable com&pletion of forms"
msgstr "启用表单补全(&F)"
-#: htmlopts.cpp:67
+#: htmlopts.cpp:71
msgid ""
"If this box is checked, Konqueror will remember the data you enter in web forms "
"and suggest it in similar fields for all forms."
msgstr "如果启用该选项,Konqueror 将记住您在表单中输入的数据,在以后的表单中的同样的字段中将提示这些数据。"
-#: htmlopts.cpp:72
+#: htmlopts.cpp:76
msgid "&Maximum completions:"
msgstr "最多补全(&M):"
-#: htmlopts.cpp:75
+#: htmlopts.cpp:79
msgid ""
"Here you can select how many values Konqueror will remember for a form field."
msgstr "您可以选择 Konqueror 为一个表单字段记住多少个值。"
-#: htmlopts.cpp:83
-msgid "Tabbed Browsing"
-msgstr "标签式浏览"
-
-#: htmlopts.cpp:86
-msgid "Open &links in new tab instead of in new window"
-msgstr "在新的标签而不是在新窗口中打开链接(&L)"
-
#: htmlopts.cpp:87
-msgid ""
-"This will open a new tab instead of a new window in various situations, such as "
-"choosing a link or a folder with the middle mouse button."
-msgstr "这将在各种情况下在新标签而不是新窗口中打开,如用鼠标中键选择链接或者文件夹。"
-
-#: htmlopts.cpp:92
-msgid "Hide the tab bar when only one tab is open"
-msgstr "仅打开一个标签时隐藏标签栏"
-
-#: htmlopts.cpp:93
-msgid ""
-"This will display the tab bar only if there are two or more tabs. Otherwise it "
-"will always be displayed."
-msgstr "仅当打开了两个或更多标签时才显示标签栏。否则,将会总是显示标签栏。"
-
-#: htmlopts.cpp:108
msgid "Mouse Beha&vior"
msgstr "鼠标行为(&V)"
-#: htmlopts.cpp:110
+#: htmlopts.cpp:89
msgid "Chan&ge cursor over links"
msgstr "在链接上改变鼠标指针的形状(&G)"
-#: htmlopts.cpp:111
+#: htmlopts.cpp:90
msgid ""
"If this option is set, the shape of the cursor will change (usually to a hand) "
"if it is moved over a hyperlink."
msgstr "如果设置了这个选项,当鼠标移动到超级链接上时,指针将会改变形状(通常会是一个手的形状)"
-#: htmlopts.cpp:115
+#: htmlopts.cpp:94
msgid "M&iddle click opens URL in selection"
msgstr "中键单击打开选中的 URL(&I)"
-#: htmlopts.cpp:117
+#: htmlopts.cpp:96
msgid ""
"If this box is checked, you can open the URL in the selection by middle "
"clicking on a Konqueror view."
msgstr "如果选中了此框,您就可以在 Konqueror 视图中单击中键来打开选中的 URL。"
-#: htmlopts.cpp:121
+#: htmlopts.cpp:100
msgid "Right click goes &back in history"
msgstr "右键单击在历史中后退(&B)"
-#: htmlopts.cpp:123
+#: htmlopts.cpp:102
msgid ""
"If this box is checked, you can go back in history by right clicking on a "
"Konqueror view. To access the context menu, press the right mouse button and "
"move."
msgstr "如果选中此框,只需在 Konqueror 视图中单击鼠标右键即可在历史中后退。如果想要访问快捷菜单,请按鼠标右键并移动。"
-#: htmlopts.cpp:132
+#: htmlopts.cpp:111
msgid "A&utomatically load images"
msgstr "自动装入图像(&U)"
-#: htmlopts.cpp:133
+#: htmlopts.cpp:112
msgid ""
"If this box is checked, Konqueror will automatically load any images that are "
"embedded in a web page. Otherwise, it will display placeholders for the images, "
@@ -391,11 +365,23 @@ msgstr ""
"如果选中此框,Konqueror 将会自动装入网页中嵌入的任何图像。否则,将在图像的位置显示占位符。您可以单击图像按钮手动装入图像。"
"<br>除非您的网络连接速度非常慢,否则您可能想要选中此框来增强您的浏览体验。"
-#: htmlopts.cpp:138
+#: htmlopts.cpp:117
+#, fuzzy
+msgid "Enable &favicons"
+msgstr "启用过滤器"
+
+#: htmlopts.cpp:118
+msgid ""
+"If this box is checked, Konqueror will automatically load and display favicon "
+"images that are associated with a web page. These images appear in the Location "
+"bar. Otherwise a generic image will appear."
+msgstr ""
+
+#: htmlopts.cpp:123
msgid "Dra&w frame around not completely loaded images"
msgstr "在尚未完全装入的图像周围绘制边框(&W)"
-#: htmlopts.cpp:139
+#: htmlopts.cpp:124
msgid ""
"If this box is checked, Konqueror will draw a frame as placeholder around not "
"yet fully loaded images that are embedded in a web page."
@@ -405,37 +391,37 @@ msgstr ""
"如果选中此框,Konqueror 将会在尚未完全装入的网页嵌入图像周围显示框架,作为占位符。"
"<br>除非您的网络连接速度非常慢,否则您可能想要选中此框来增强您的浏览体验。"
-#: htmlopts.cpp:144
+#: htmlopts.cpp:129
msgid "Allow automatic delayed &reloading/redirecting"
msgstr "允许自动延迟刷新/重定向(&R)"
-#: htmlopts.cpp:146
+#: htmlopts.cpp:131
msgid ""
"Some web pages request an automatic reload or redirection after a certain "
"period of time. By unchecking this box Konqueror will ignore these requests."
msgstr "某些网页会请求在经过一段时间后自动刷新或重定向。取消此框将使得 Konqueror 忽略这些请求。"
-#: htmlopts.cpp:158
+#: htmlopts.cpp:143
msgid "Und&erline links:"
msgstr "链接带下划线(&E):"
-#: htmlopts.cpp:161
+#: htmlopts.cpp:146
msgid ""
"_: underline\n"
"Enabled"
msgstr "已启用"
-#: htmlopts.cpp:162
+#: htmlopts.cpp:147
msgid ""
"_: underline\n"
"Disabled"
msgstr "已禁用"
-#: htmlopts.cpp:163
+#: htmlopts.cpp:148
msgid "Only on Hover"
msgstr "悬停"
-#: htmlopts.cpp:167
+#: htmlopts.cpp:152
msgid ""
"Controls how Konqueror handles underlining hyperlinks:"
"<br>"
@@ -454,27 +440,28 @@ msgstr ""
"<li><b>悬停</b>:仅当鼠标指向链接时才加下划线</li></ul>"
"<br><i>请注意:网站的 CSS 定义可以覆盖此设置</i>"
-#: htmlopts.cpp:178
+#: htmlopts.cpp:163
msgid "A&nimations:"
msgstr "动画(&N):"
-#: htmlopts.cpp:181
+#: htmlopts.cpp:166
msgid ""
"_: animations\n"
"Enabled"
msgstr "已启用"
-#: htmlopts.cpp:182
+#: htmlopts.cpp:167
msgid ""
"_: animations\n"
"Disabled"
msgstr "已禁用"
-#: htmlopts.cpp:183
+#: htmlopts.cpp:168
msgid "Show Only Once"
msgstr "只显示一次"
-#: htmlopts.cpp:187
+#: htmlopts.cpp:172
+#, fuzzy
msgid ""
"Controls how Konqueror shows animated images:"
"<br>"
@@ -482,7 +469,7 @@ msgid ""
"<li><b>Enabled</b>: Show all animations completely.</li>"
"<li><b>Disabled</b>: Never show animations, show the start image only.</li>"
"<li><b>Show only once</b>: Show all animations completely but do not repeat "
-"them.</li>"
+"them.</li></ul>"
msgstr ""
"控制 Konqueror 如何显示动画图像:"
"<br>"
@@ -491,6 +478,35 @@ msgstr ""
"<li><b>禁用</b>:从不显示动画,只显示起始图像。</li>"
"<li><b>只显示一次</b>:完整显示所有动画,但并不重复。</li>"
+#: htmlopts.cpp:180
+msgid "Sm&ooth scrolling"
+msgstr ""
+
+#: htmlopts.cpp:183
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Enabled"
+msgstr "已启用"
+
+#: htmlopts.cpp:184
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Disabled"
+msgstr "已禁用"
+
+#: htmlopts.cpp:189
+msgid ""
+"Determines whether Konqueror should use smooth steps to scroll HTML pages, or "
+"whole steps:"
+"<br>"
+"<ul>"
+"<li><b>Always</b>: Always use smooth steps when scrolling.</li>"
+"<li><b>Never</b>: Never use smooth scrolling, scroll with whole steps "
+"instead.</li></ul>"
+msgstr ""
+
#: javaopts.cpp:62 jsopts.cpp:48 pluginopts.cpp:59
msgid "Global Settings"
msgstr "全局设置"
@@ -616,7 +632,7 @@ msgstr ""
"如果所有的小程序都被销毁,那么小程序服务器就应该关闭。但是,启动 Java 虚拟机很费时间。如果您想要在您浏览的时候仍然保留 Java "
"进程,您可以将超时的值设置为您希望的值。要在 Konqueror 进程全程保留 Java 进程,请不要选中关闭小程序服务器。"
-#: javaopts.cpp:283 pluginopts.cpp:626
+#: javaopts.cpp:283 pluginopts.cpp:628
msgid "Doma&in-Specific"
msgstr "特定域(&I)"
@@ -901,19 +917,19 @@ msgstr "接受的语言:"
msgid "Accept character sets:"
msgstr "接受字符集:"
-#: main.cpp:82
+#: main.cpp:89
msgid "kcmkonqhtml"
msgstr "kcmkonqhtml"
-#: main.cpp:82
+#: main.cpp:89
msgid "Konqueror Browsing Control Module"
msgstr "Konqueror 浏览控制模块"
-#: main.cpp:84
+#: main.cpp:91
msgid "(c) 1999 - 2001 The Konqueror Developers"
msgstr "(C) 1999 - 2001 Konqueror 开发者"
-#: main.cpp:94
+#: main.cpp:101
msgid ""
"JavaScript access controls\n"
"Per-domain policies extensions"
@@ -921,15 +937,15 @@ msgstr ""
"JavaScript 访问控制\n"
"特定域策略扩展"
-#: main.cpp:106
+#: main.cpp:113
msgid "&Java"
msgstr "&Java"
-#: main.cpp:110
+#: main.cpp:117
msgid "Java&Script"
msgstr "Java&Script"
-#: main.cpp:159
+#: main.cpp:166
msgid ""
"<h2>JavaScript</h2>On this page, you can configure whether JavaScript programs "
"embedded in web pages should be allowed to be executed by Konqueror."
@@ -967,7 +983,7 @@ msgstr "插件的 CPU 优先级:%1"
msgid "Domain-Specific Settin&gs"
msgstr "特定域的设置(&G)"
-#: pluginopts.cpp:86 pluginopts.cpp:593
+#: pluginopts.cpp:86 pluginopts.cpp:595
msgid "Domain-Specific Policies"
msgstr "特定域的策略"
@@ -1012,7 +1028,7 @@ msgstr ""
"您可以在这里为特定的主机或域名设置插件策略。要添加新的策略,请单击<i>添加...</i>按钮并在对话框中提供必要的信息。要更改已有的策略,请单击<i>"
"修改...</i>按钮并从策略对话框中选择新的策略。单击<i>删除</i>按钮将删除选中策略,这将使得对该域名应用默认的策略设置。"
-#: pluginopts.cpp:129 pluginopts.cpp:523
+#: pluginopts.cpp:129 pluginopts.cpp:525
msgid "Netscape Plugins"
msgstr "Netscape 插件"
@@ -1077,35 +1093,35 @@ msgstr "正在扫描插件"
msgid "Select Plugin Scan Folder"
msgstr "选择插件扫描文件夹"
-#: pluginopts.cpp:546
+#: pluginopts.cpp:548
msgid "Plugin"
msgstr "插件"
-#: pluginopts.cpp:563
+#: pluginopts.cpp:565
msgid "MIME type"
msgstr "MIME 类型"
-#: pluginopts.cpp:568
+#: pluginopts.cpp:570
msgid "Description"
msgstr "描述"
-#: pluginopts.cpp:573
+#: pluginopts.cpp:575
msgid "Suffixes"
msgstr "后缀"
-#: pluginopts.cpp:638
+#: pluginopts.cpp:640
msgid "New Plugin Policy"
msgstr "新建插件策略"
-#: pluginopts.cpp:641
+#: pluginopts.cpp:643
msgid "Change Plugin Policy"
msgstr "修改插件策略"
-#: pluginopts.cpp:645
+#: pluginopts.cpp:647
msgid "&Plugin policy:"
msgstr "插件策略(&P):"
-#: pluginopts.cpp:646
+#: pluginopts.cpp:648
msgid "Select a plugin policy for the above host or domain."
msgstr "为以上主机或域选择插件策略。"
@@ -1114,210 +1130,273 @@ msgid "&Host or domain name:"
msgstr "主机或域名(&H):"
#: policydlg.cpp:40
+#, fuzzy
msgid ""
-"Enter the name of a host (like www.kde.org) or a domain, starting with a dot "
-"(like .kde.org or .org)"
+"Enter the name of a host (like www.trinitydesktop.org) or a domain, starting "
+"with a dot (like .trinitydesktop.org or .org)"
msgstr "输入主机名(如 www.kde.org)或以点起始的域名(如.kde.org 或.org)"
#: policydlg.cpp:112
msgid "You must first enter a domain name."
msgstr "您必须先输入域名。"
-#. i18n: file advancedTabOptions.ui line 27
+#. i18n: file nsconfigwidget.ui line 17
#: rc.cpp:3
#, no-c-format
-msgid "<b>Advanced Options</b>"
-msgstr "<b>高级选项</b>"
+msgid "Netscape Plugin Config"
+msgstr "Netscape 插件配置"
-#. i18n: file advancedTabOptions.ui line 57
+#. i18n: file nsconfigwidget.ui line 40
#: rc.cpp:6
#, no-c-format
-msgid "O&pen new tabs in the background"
-msgstr "在后台打开新标签(&P)"
+msgid "Scan"
+msgstr "扫描"
-#. i18n: file advancedTabOptions.ui line 60
+#. i18n: file nsconfigwidget.ui line 59
#: rc.cpp:9
#, no-c-format
-msgid ""
-"This will open a new tab in the background, instead of in the foreground."
-msgstr "这将在后台打开新标签,否则将在前台打开。"
+msgid "&Scan for New Plugins"
+msgstr "扫描新插件(&S)"
-#. i18n: file advancedTabOptions.ui line 68
+#. i18n: file nsconfigwidget.ui line 62
#: rc.cpp:12
#, no-c-format
-msgid "Open &new tab after current tab"
-msgstr "在当前标签之后打开新标签(&N)"
+msgid "Click here to scan for newly installed Netscape plugins now."
+msgstr "单击此处扫描新安装的 Netscape 插件。"
-#. i18n: file advancedTabOptions.ui line 71
+#. i18n: file nsconfigwidget.ui line 89
#: rc.cpp:15
#, no-c-format
-msgid ""
-"This will open a new tab opened from a page after the current tab, instead of "
-"after the last tab."
-msgstr "这将在当前标签之后打开新标签,否则将在最后一个标签之后打开。"
+msgid "Scan for new plugins at &TDE startup"
+msgstr "TDE 启动时扫描新插件(&K)"
-#. i18n: file advancedTabOptions.ui line 79
+#. i18n: file nsconfigwidget.ui line 92
#: rc.cpp:18
#, no-c-format
-msgid "Confirm &when closing windows with multiple tabs"
-msgstr "关闭含有多页的窗口时确认(&W)"
-
-#. i18n: file advancedTabOptions.ui line 82
-#: rc.cpp:21
-#, no-c-format
msgid ""
-"This will ask you whether you are sure you want to close a window when it has "
-"multiple tabs opened in it."
-msgstr "在您将要关闭多页的窗口时询问您是否确定。"
+"If this option is enabled, TDE will look for new Netscape plugins every time it "
+"starts up. This makes it easier for you if you often install new plugins, but "
+"it may also slow down TDE startup. You might want to disable this option, "
+"especially if you seldom install plugins."
+msgstr ""
+"如果启用此选项,TDE 将在每次启动的时候查找新的 Netscape 插件。如果您经常安装插件,这将非常方便,但可能放慢 TDE "
+"启动的时间。您可能想要禁用此选项,特别是您很少安装插件。"
-#. i18n: file advancedTabOptions.ui line 90
-#: rc.cpp:24
+#. i18n: file nsconfigwidget.ui line 106
+#: rc.cpp:21
#, no-c-format
-msgid "&Show close button instead of website icon"
-msgstr "显示关闭按钮而不是网站图标(&S)"
+msgid "Scan Folders"
+msgstr "扫描文件夹"
-#. i18n: file advancedTabOptions.ui line 93
+#. i18n: file nsconfigwidget.ui line 128
#: rc.cpp:27
#, no-c-format
-msgid ""
-"This will display close buttons inside each tab instead of websites' icons."
-msgstr "这将在每个标签上显示关闭按钮,而不是网站的图标。"
+msgid "&New"
+msgstr "新建(&N)"
-#. i18n: file advancedTabOptions.ui line 101
+#. i18n: file nsconfigwidget.ui line 150
#: rc.cpp:30
#, no-c-format
-msgid "Open pop&ups in new tab instead of in new window"
-msgstr "在新的标签而不是在新窗口中打开弹出窗口(&U)"
+msgid "Do&wn"
+msgstr "下移(&W)"
-#. i18n: file advancedTabOptions.ui line 104
+#. i18n: file nsconfigwidget.ui line 161
#: rc.cpp:33
#, no-c-format
-msgid ""
-"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
-"window."
-msgstr "允许的 JavaScript 弹出窗口是应该在新标签还是在新窗口中打开。"
+msgid "&Up"
+msgstr "上移(&U)"
-#. i18n: file advancedTabOptions.ui line 112
+#. i18n: file nsconfigwidget.ui line 203
#: rc.cpp:36
#, no-c-format
-msgid "Activate previous used tab when closing the current tab"
-msgstr "关闭当前标签时激活先前使用的标签"
-
-#. i18n: file advancedTabOptions.ui line 115
-#: rc.cpp:39
-#, no-c-format
-msgid ""
-"When checking this the previous used or opened tab will be activated when you "
-"close the current active tab instead of the one right to the current tab."
-msgstr "选中此项时,当您关闭当前激活的标签时将会打开先前使用或打开的标签,而不是当前标签右侧的标签。"
+msgid "Plugins"
+msgstr "插件"
-#. i18n: file advancedTabOptions.ui line 123
+#. i18n: file nsconfigwidget.ui line 223
#: rc.cpp:42
#, no-c-format
-msgid "Open as tab in existing Konqueror when URL is called externally"
-msgstr "从外部调用 URL 时,在已有 Konqueror 中打开相应的标签"
+msgid "Value"
+msgstr "值"
-#. i18n: file advancedTabOptions.ui line 126
+#. i18n: file nsconfigwidget.ui line 239
#: rc.cpp:45
#, no-c-format
-msgid ""
-"When you click a URL in another TDE program or call kfmclient to open a URL, "
-"the current desktop will be searched for a non-minimized Konqueror and, if "
-"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
-"will be opened with the required URL."
-msgstr ""
-"当您在其它 TDE 程序中点击 URL 或调用 kfmclient 打开 URL 时,系统将会搜索当前桌面,看有没有非最小化的 "
-"Konqueror。如果有的话,该 URL 将会打开为其中的一个新标签。否则,将会为所请求的 URL 打开一个新的 Konqueror 窗口。"
+msgid "Here you can see a list of the Netscape plugins TDE has found."
+msgstr "您可以在这里看到 TDE 已经找到的 Netscape 插件列表。"
-#. i18n: file nsconfigwidget.ui line 17
+#. i18n: file nsconfigwidget.ui line 250
#: rc.cpp:48
#, no-c-format
-msgid "Netscape Plugin Config"
-msgstr "Netscape 插件配置"
+msgid "Use a&rtsdsp to pipe plugin sound through aRts"
+msgstr "通过 aRts 使用 artsdsp 处理插件声音(&R)"
-#. i18n: file nsconfigwidget.ui line 40
+#. i18n: file userInterOpts.ui line 35
#: rc.cpp:51
#, no-c-format
-msgid "Scan"
-msgstr "扫描"
+msgid "Tabbed Browsing"
+msgstr "标签式浏览"
-#. i18n: file nsconfigwidget.ui line 59
+#. i18n: file userInterOpts.ui line 54
#: rc.cpp:54
#, no-c-format
-msgid "&Scan for New Plugins"
-msgstr "扫描新插件(&S)"
+msgid "Open &links in new tab instead of in new window"
+msgstr "在新的标签而不是在新窗口中打开链接(&L)"
-#. i18n: file nsconfigwidget.ui line 62
+#. i18n: file userInterOpts.ui line 57
#: rc.cpp:57
#, no-c-format
-msgid "Click here to scan for newly installed Netscape plugins now."
-msgstr "单击此处扫描新安装的 Netscape 插件。"
+msgid ""
+"This will open a new tab instead of a new window in various situations, such as "
+"choosing a link or a folder with the middle mouse button."
+msgstr "这将在各种情况下在新标签而不是新窗口中打开,如用鼠标中键选择链接或者文件夹。"
-#. i18n: file nsconfigwidget.ui line 89
+#. i18n: file userInterOpts.ui line 65
#: rc.cpp:60
-#, no-c-format
-msgid "Scan for new plugins at &TDE startup"
-msgstr "TDE 启动时扫描新插件(&K)"
+#, fuzzy, no-c-format
+msgid "&Hide the tab bar when only one tab is open"
+msgstr "仅打开一个标签时隐藏标签栏"
-#. i18n: file nsconfigwidget.ui line 92
+#. i18n: file userInterOpts.ui line 68
#: rc.cpp:63
#, no-c-format
msgid ""
-"If this option is enabled, TDE will look for new Netscape plugins every time it "
-"starts up. This makes it easier for you if you often install new plugins, but "
-"it may also slow down TDE startup. You might want to disable this option, "
-"especially if you seldom install plugins."
-msgstr ""
-"如果启用此选项,TDE 将在每次启动的时候查找新的 Netscape 插件。如果您经常安装插件,这将非常方便,但可能放慢 TDE "
-"启动的时间。您可能想要禁用此选项,特别是您很少安装插件。"
+"This will display the tab bar only if there are two or more tabs. Otherwise it "
+"will always be displayed."
+msgstr "仅当打开了两个或更多标签时才显示标签栏。否则,将会总是显示标签栏。"
-#. i18n: file nsconfigwidget.ui line 106
+#. i18n: file userInterOpts.ui line 76
#: rc.cpp:66
#, no-c-format
-msgid "Scan Folders"
-msgstr "扫描文件夹"
+msgid "C&ycle tabs with mouse wheel"
+msgstr ""
-#. i18n: file nsconfigwidget.ui line 128
+#. i18n: file userInterOpts.ui line 79
+#: rc.cpp:69
+#, fuzzy, no-c-format
+msgid ""
+"This will cycle through tabs when there are two or more tabs using the mouse "
+"wheel."
+msgstr "仅当打开了两个或更多标签时才显示标签栏。否则,将会总是显示标签栏。"
+
+#. i18n: file userInterOpts.ui line 87
#: rc.cpp:72
#, no-c-format
-msgid "&New"
-msgstr "新建(&N)"
+msgid "O&pen new tabs in the background"
+msgstr "在后台打开新标签(&P)"
-#. i18n: file nsconfigwidget.ui line 150
+#. i18n: file userInterOpts.ui line 90
#: rc.cpp:75
#, no-c-format
-msgid "Do&wn"
-msgstr "下移(&W)"
+msgid ""
+"This will open a new tab in the background, instead of in the foreground."
+msgstr "这将在后台打开新标签,否则将在前台打开。"
-#. i18n: file nsconfigwidget.ui line 161
+#. i18n: file userInterOpts.ui line 98
#: rc.cpp:78
#, no-c-format
-msgid "&Up"
-msgstr "上移(&U)"
+msgid "Open &new tab after current tab"
+msgstr "在当前标签之后打开新标签(&N)"
-#. i18n: file nsconfigwidget.ui line 203
+#. i18n: file userInterOpts.ui line 101
#: rc.cpp:81
#, no-c-format
-msgid "Plugins"
-msgstr "插件"
+msgid ""
+"This will open a new tab opened from a page after the current tab, instead of "
+"after the last tab."
+msgstr "这将在当前标签之后打开新标签,否则将在最后一个标签之后打开。"
-#. i18n: file nsconfigwidget.ui line 223
+#. i18n: file userInterOpts.ui line 109
+#: rc.cpp:84
+#, no-c-format
+msgid "Confirm &when closing windows with multiple tabs"
+msgstr "关闭含有多页的窗口时确认(&W)"
+
+#. i18n: file userInterOpts.ui line 112
#: rc.cpp:87
#, no-c-format
-msgid "Value"
-msgstr "值"
+msgid ""
+"This will ask you whether you are sure you want to close a window when it has "
+"multiple tabs opened in it."
+msgstr "在您将要关闭多页的窗口时询问您是否确定。"
-#. i18n: file nsconfigwidget.ui line 239
+#. i18n: file userInterOpts.ui line 120
#: rc.cpp:90
#, no-c-format
-msgid "Here you can see a list of the Netscape plugins TDE has found."
-msgstr "您可以在这里看到 TDE 已经找到的 Netscape 插件列表。"
+msgid "&Show close button instead of website icon"
+msgstr "显示关闭按钮而不是网站图标(&S)"
-#. i18n: file nsconfigwidget.ui line 250
+#. i18n: file userInterOpts.ui line 123
#: rc.cpp:93
#, no-c-format
-msgid "Use a&rtsdsp to pipe plugin sound through aRts"
-msgstr "通过 aRts 使用 artsdsp 处理插件声音(&R)"
+msgid ""
+"This will display close buttons inside each tab instead of websites' icons."
+msgstr "这将在每个标签上显示关闭按钮,而不是网站的图标。"
+
+#. i18n: file userInterOpts.ui line 131
+#: rc.cpp:96
+#, fuzzy, no-c-format
+msgid "&Show close button instead of website icon with mouse hover"
+msgstr "显示关闭按钮而不是网站图标(&S)"
+
+#. i18n: file userInterOpts.ui line 134
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid ""
+"This will display a close button inside each tab instead of websites' icons "
+"when the mouse pointer hovers the icon."
+msgstr "这将在每个标签上显示关闭按钮,而不是网站的图标。"
+
+#. i18n: file userInterOpts.ui line 142
+#: rc.cpp:102
+#, no-c-format
+msgid "Open pop&ups in new tab instead of in new window"
+msgstr "在新的标签而不是在新窗口中打开弹出窗口(&U)"
+
+#. i18n: file userInterOpts.ui line 145
+#: rc.cpp:105
+#, no-c-format
+msgid ""
+"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
+"window."
+msgstr "允许的 JavaScript 弹出窗口是应该在新标签还是在新窗口中打开。"
+
+#. i18n: file userInterOpts.ui line 153
+#: rc.cpp:108
+#, no-c-format
+msgid "Open as tab in existing Konqueror when URL is called externally"
+msgstr "从外部调用 URL 时,在已有 Konqueror 中打开相应的标签"
+
+#. i18n: file userInterOpts.ui line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When you click a URL in another TDE program or call kfmclient to open a URL, "
+"the current desktop will be searched for a non-minimized Konqueror and, if "
+"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
+"will be opened with the required URL."
+msgstr ""
+"当您在其它 TDE 程序中点击 URL 或调用 kfmclient 打开 URL 时,系统将会搜索当前桌面,看有没有非最小化的 "
+"Konqueror。如果有的话,该 URL 将会打开为其中的一个新标签。否则,将会为所请求的 URL 打开一个新的 Konqueror 窗口。"
+
+#. i18n: file userInterOpts.ui line 164
+#: rc.cpp:114
+#, no-c-format
+msgid "Activate previous used tab when closing the current tab"
+msgstr "关闭当前标签时激活先前使用的标签"
+
+#. i18n: file userInterOpts.ui line 167
+#: rc.cpp:117
+#, no-c-format
+msgid ""
+"When checking this the previous used or opened tab will be activated when you "
+"close the current active tab instead of the one right to the current tab."
+msgstr "选中此项时,当您关闭当前激活的标签时将会打开先前使用或打开的标签,而不是当前标签右侧的标签。"
+
+#~ msgid "Advanced Options"
+#~ msgstr "高级选项"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>高级选项</b>"
#~ msgid "Import.."
#~ msgstr "导入..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
index 6cb5b346f81..d86056c20d1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkonsole\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:43+0800\n"
"Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,8 +29,9 @@ msgid ""
msgstr "i18n-translation@lists.linux.net.cn"
#: kcmkonsole.cpp:43
+#, fuzzy
msgid ""
-"<h1>Konsole</h1> With this module you can configure Konsole, the TDE terminal "
+"<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal "
"application. You can configure the generic Konsole options (which can also be "
"configured using the RMB) and you can edit the schemas and sessions available "
"to Konsole."
@@ -51,7 +53,7 @@ msgstr "KCM Konsole"
msgid "KControl module for Konsole configuration"
msgstr "用于配置 Konsole 的 KControl 模块"
-#: kcmkonsole.cpp:162
+#: kcmkonsole.cpp:171
msgid ""
"The Ctrl+S/Ctrl+Q flow control setting will only affect newly started Konsole "
"sessions.\n"
@@ -61,7 +63,7 @@ msgstr ""
"Ctrl+S/Ctrl+Q 流控设置将只在新打开的 Konsole 会话中有效。\n"
"已经存在的 Konsole 会话可以用“stty”命令改变流控设置。"
-#: kcmkonsole.cpp:170
+#: kcmkonsole.cpp:179
msgid ""
"You have chosen to enable bidirectional text rendering by default.\n"
"Note that bidirectional text may not always be shown correctly, especially when "
@@ -79,506 +81,512 @@ msgstr ""
msgid "&General"
msgstr "常规(&G)"
-#. i18n: file kcmkonsoledialog.ui line 70
+#. i18n: file kcmkonsoledialog.ui line 78
#: rc.cpp:6
#, no-c-format
-msgid "Double Click"
-msgstr "双击"
-
-#. i18n: file kcmkonsoledialog.ui line 81
-#: rc.cpp:9
-#, no-c-format
-msgid "Consider the following characters &part of a word when double clicking:"
-msgstr "双击选定单词时将下列字符当作单词内的字符(&P):"
-
-#. i18n: file kcmkonsoledialog.ui line 107
-#: rc.cpp:12
-#, no-c-format
-msgid "Misc"
-msgstr "杂项"
-
-#. i18n: file kcmkonsoledialog.ui line 118
-#: rc.cpp:15
-#, no-c-format
msgid "Show terminal si&ze after resizing"
msgstr "改变大小后显示终端尺寸(&Z)"
-#. i18n: file kcmkonsoledialog.ui line 126
-#: rc.cpp:18
+#. i18n: file kcmkonsoledialog.ui line 86
+#: rc.cpp:9
#, no-c-format
msgid "Show &frame"
msgstr "显示边框(&F)"
-#. i18n: file kcmkonsoledialog.ui line 134
-#: rc.cpp:21
+#. i18n: file kcmkonsoledialog.ui line 94
+#: rc.cpp:12
#, no-c-format
msgid "&Confirm quit when closing more than one session"
msgstr "关闭多个会话时确认退出(&C)"
-#. i18n: file kcmkonsoledialog.ui line 142
-#: rc.cpp:24
+#. i18n: file kcmkonsoledialog.ui line 102
+#: rc.cpp:15
#, no-c-format
msgid "&Blinking cursor"
msgstr "光标闪烁(&B)"
-#. i18n: file kcmkonsoledialog.ui line 150
-#: rc.cpp:27
+#. i18n: file kcmkonsoledialog.ui line 110
+#: rc.cpp:18
#, no-c-format
msgid "&Require Ctrl key for drag and drop"
msgstr "拖放操作必需使用 Ctrl 键(&R)"
-#. i18n: file kcmkonsoledialog.ui line 158
-#: rc.cpp:30
+#. i18n: file kcmkonsoledialog.ui line 118
+#: rc.cpp:21
#, no-c-format
msgid "Triple click selects &only from the current word forward"
msgstr "三击只选择当前单词后面的内容(&O)"
-#. i18n: file kcmkonsoledialog.ui line 166
-#: rc.cpp:33
+#. i18n: file kcmkonsoledialog.ui line 126
+#: rc.cpp:24
#, no-c-format
msgid "Allow progr&ams to resize terminal window"
msgstr "允许程序改变终端窗口大小(&A)"
-#. i18n: file kcmkonsoledialog.ui line 174
+#. i18n: file kcmkonsoledialog.ui line 134
+#: rc.cpp:27
+#, fuzzy, no-c-format
+msgid "&Use Ctrl+S/Ctrl+Q flow control"
+msgstr "使用 Ctrl+S/Ctrl+Q 流控"
+
+#. i18n: file kcmkonsoledialog.ui line 142
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "E&nable bidirectional text rendering"
+msgstr "启用双向文字渲染"
+
+#. i18n: file kcmkonsoledialog.ui line 150
+#: rc.cpp:33
+#, fuzzy, no-c-format
+msgid "Set &tab title to match window title"
+msgstr "将标签标题设定为匹配窗口标题"
+
+#. i18n: file kcmkonsoledialog.ui line 158
#: rc.cpp:36
#, no-c-format
-msgid "Use Ctrl+S/Ctrl+Q flow control"
-msgstr "使用 Ctrl+S/Ctrl+Q 流控"
+msgid "Cycle tabs &with mouse wheel"
+msgstr ""
-#. i18n: file kcmkonsoledialog.ui line 199
+#. i18n: file kcmkonsoledialog.ui line 166
#: rc.cpp:39
#, no-c-format
-msgid "Enable bidirectional text rendering"
-msgstr "启用双向文字渲染"
+msgid "Enable main &menu accelerator keys"
+msgstr ""
-#. i18n: file kcmkonsoledialog.ui line 215
+#. i18n: file kcmkonsoledialog.ui line 174
#: rc.cpp:42
#, no-c-format
-msgid "Seconds to detect s&ilence:"
-msgstr "空闲检测的门限秒数(&I):"
+msgid "Handle Meta &key as Alt Key"
+msgstr ""
-#. i18n: file kcmkonsoledialog.ui line 269
+#. i18n: file kcmkonsoledialog.ui line 190
#: rc.cpp:45
#, no-c-format
msgid "&Line spacing:"
msgstr "行间距(&L):"
-#. i18n: file kcmkonsoledialog.ui line 297
+#. i18n: file kcmkonsoledialog.ui line 262
#: rc.cpp:48
#, no-c-format
-msgid "Set tab title to match window title"
-msgstr "将标签标题设定为匹配窗口标题"
+msgid "Seconds to detect s&ilence:"
+msgstr "空闲检测的门限秒数(&I):"
-#. i18n: file kcmkonsoledialog.ui line 309
+#. i18n: file kcmkonsoledialog.ui line 292
#: rc.cpp:51
#, no-c-format
+msgid "Consider the following characters &part of a word when double clicking:"
+msgstr "双击选定单词时将下列字符当作单词内的字符(&P):"
+
+#. i18n: file kcmkonsoledialog.ui line 320
+#: rc.cpp:54
+#, no-c-format
msgid "&Schema"
msgstr "方案(&S)"
-#. i18n: file kcmkonsoledialog.ui line 327
-#: rc.cpp:54
+#. i18n: file kcmkonsoledialog.ui line 338
+#: rc.cpp:57
#, no-c-format
msgid "S&ession"
msgstr "会话(&E)"
#. i18n: file schemadialog.ui line 16
-#: rc.cpp:57
+#: rc.cpp:60
#, no-c-format
msgid "Konsole Schema Editor"
msgstr "Konsole 方案编辑器"
#. i18n: file schemadialog.ui line 42
-#: rc.cpp:60
+#: rc.cpp:63
#, no-c-format
msgid "&Title:"
msgstr "标题(&T):"
#. i18n: file schemadialog.ui line 76
-#: rc.cpp:63
+#: rc.cpp:66
#, no-c-format
msgid "Colors"
msgstr "颜色"
#. i18n: file schemadialog.ui line 87
-#: rc.cpp:66
+#: rc.cpp:69
#, no-c-format
msgid "Shell co&lor:"
msgstr "Shell 颜色(&L):"
#. i18n: file schemadialog.ui line 98
-#: rc.cpp:69
+#: rc.cpp:72
#, no-c-format
msgid "&Bold"
msgstr "粗体(&B)"
#. i18n: file schemadialog.ui line 129
-#: rc.cpp:72 rc.cpp:225
+#: rc.cpp:75 rc.cpp:228
#, no-c-format
msgid "Custom"
msgstr "自定义"
#. i18n: file schemadialog.ui line 134
-#: rc.cpp:75
+#: rc.cpp:78
#, no-c-format
msgid "System Background"
msgstr "系统背景色"
#. i18n: file schemadialog.ui line 139
-#: rc.cpp:78
+#: rc.cpp:81
#, no-c-format
msgid "System Foreground"
msgstr "系统前景色"
#. i18n: file schemadialog.ui line 144
-#: rc.cpp:81
+#: rc.cpp:84
#, no-c-format
msgid "Random Hue"
msgstr "随机色调"
#. i18n: file schemadialog.ui line 173
-#: rc.cpp:84
+#: rc.cpp:87
#, no-c-format
msgid "Trans&parent"
msgstr "透明(&P)"
#. i18n: file schemadialog.ui line 181
-#: rc.cpp:87
+#: rc.cpp:90
#, no-c-format
msgid "&Konsole color:"
msgstr "&Konsole 颜色:"
#. i18n: file schemadialog.ui line 190
-#: rc.cpp:90
+#: rc.cpp:93
#, no-c-format
msgid "0 - Foreground Color"
msgstr "0 - 前景色"
#. i18n: file schemadialog.ui line 195
-#: rc.cpp:93
+#: rc.cpp:96
#, no-c-format
msgid "1 - Background Color"
msgstr "1 - 背景色"
#. i18n: file schemadialog.ui line 200
-#: rc.cpp:96
+#: rc.cpp:99
#, no-c-format
msgid "2 - Color 0 (black)"
msgstr "2 - 颜色0 (黑)"
#. i18n: file schemadialog.ui line 205
-#: rc.cpp:99
+#: rc.cpp:102
#, no-c-format
msgid "3 - Color 1 (red)"
msgstr "3 - 颜色1 (红)"
#. i18n: file schemadialog.ui line 210
-#: rc.cpp:102
+#: rc.cpp:105
#, no-c-format
msgid "4 - Color 2 (green)"
msgstr "4 - 颜色2 (红)"
#. i18n: file schemadialog.ui line 215
-#: rc.cpp:105
+#: rc.cpp:108
#, no-c-format
msgid "5 - Color 3 (yellow)"
msgstr "5 - 颜色3 (黄)"
#. i18n: file schemadialog.ui line 220
-#: rc.cpp:108
+#: rc.cpp:111
#, no-c-format
msgid "6 - Color 4 (blue)"
msgstr "6 - 颜色4 (蓝)"
#. i18n: file schemadialog.ui line 225
-#: rc.cpp:111
+#: rc.cpp:114
#, no-c-format
msgid "7 - Color 5 (magenta)"
msgstr "7 - 颜色5 (紫)"
#. i18n: file schemadialog.ui line 230
-#: rc.cpp:114
+#: rc.cpp:117
#, no-c-format
msgid "8 - Color 6 (cyan)"
msgstr "8 - 颜色6 (青)"
#. i18n: file schemadialog.ui line 235
-#: rc.cpp:117
+#: rc.cpp:120
#, no-c-format
msgid "9 - Color 7 (white)"
msgstr "9 - 颜色7 (白)"
#. i18n: file schemadialog.ui line 240
-#: rc.cpp:120
+#: rc.cpp:123
#, no-c-format
msgid "10 - Foreground Intensive Color"
msgstr "10 - 前景色增强"
#. i18n: file schemadialog.ui line 245
-#: rc.cpp:123
+#: rc.cpp:126
#, no-c-format
msgid "11 - Background Intensive Color"
msgstr "11 - 背景色增强"
#. i18n: file schemadialog.ui line 250
-#: rc.cpp:126
+#: rc.cpp:129
#, no-c-format
msgid "12 - Color 0 Intensive (gray)"
msgstr "12 - 颜色 0 增强(灰)"
#. i18n: file schemadialog.ui line 255
-#: rc.cpp:129
+#: rc.cpp:132
#, no-c-format
msgid "13 - Color 1 Intensive (light red)"
msgstr "13 - 颜色 1 增强(浅红)"
#. i18n: file schemadialog.ui line 260
-#: rc.cpp:132
+#: rc.cpp:135
#, no-c-format
msgid "14 - Color 2 Intensive (light green)"
msgstr "14 - 颜色 2 增强(浅绿)"
#. i18n: file schemadialog.ui line 265
-#: rc.cpp:135
+#: rc.cpp:138
#, no-c-format
msgid "15 - Color 3 Intensive (light yellow)"
msgstr "15 - 颜色 3 增强(浅黄)"
#. i18n: file schemadialog.ui line 270
-#: rc.cpp:138
+#: rc.cpp:141
#, no-c-format
msgid "16 - Color 4 Intensive (light blue)"
msgstr "16 - 颜色 4 增强(浅蓝)"
#. i18n: file schemadialog.ui line 275
-#: rc.cpp:141
+#: rc.cpp:144
#, no-c-format
msgid "17 - Color 5 Intensive (light magenta)"
msgstr "17 - 颜色 5 增强(浅品红)"
#. i18n: file schemadialog.ui line 280
-#: rc.cpp:144
+#: rc.cpp:147
#, no-c-format
msgid "18 - Color 6 Intensive (light cyan)"
msgstr "18 - 颜色 6 增强(浅青)"
#. i18n: file schemadialog.ui line 285
-#: rc.cpp:147
+#: rc.cpp:150
#, no-c-format
msgid "19 - Color 7 Intensive (white)"
msgstr "19 - 颜色 7 增强(白)"
#. i18n: file schemadialog.ui line 307
-#: rc.cpp:150
+#: rc.cpp:153
#, no-c-format
msgid "Schema"
msgstr "方案"
#. i18n: file schemadialog.ui line 323
-#: rc.cpp:153
+#: rc.cpp:156
#, no-c-format
msgid "S&et as default schema"
msgstr "设为默认方案(&E)"
#. i18n: file schemadialog.ui line 339
-#: rc.cpp:156
+#: rc.cpp:159
#, no-c-format
msgid "Sa&ve Schema..."
msgstr "保存方案(&V)..."
#. i18n: file schemadialog.ui line 347
-#: rc.cpp:159
+#: rc.cpp:162
#, no-c-format
msgid "&Remove Schema"
msgstr "删除方案(&R)"
#. i18n: file schemadialog.ui line 376
-#: rc.cpp:162
+#: rc.cpp:165
#, no-c-format
msgid "Background"
msgstr "背景"
#. i18n: file schemadialog.ui line 409
-#: rc.cpp:165
+#: rc.cpp:168
#, no-c-format
msgid "..."
msgstr "..."
#. i18n: file schemadialog.ui line 415
-#: rc.cpp:168
+#: rc.cpp:171
#, no-c-format
msgid "Tiled"
msgstr "平铺"
#. i18n: file schemadialog.ui line 420
-#: rc.cpp:171
+#: rc.cpp:174
#, no-c-format
msgid "Centered"
msgstr "居中"
#. i18n: file schemadialog.ui line 425
-#: rc.cpp:174
+#: rc.cpp:177
#, no-c-format
msgid "Full"
msgstr "拉伸"
#. i18n: file schemadialog.ui line 437
-#: rc.cpp:177
+#: rc.cpp:180
#, no-c-format
msgid "&Image:"
msgstr "图片(&I):"
#. i18n: file schemadialog.ui line 448
-#: rc.cpp:180
+#: rc.cpp:183
#, no-c-format
msgid "Min"
msgstr "最弱"
#. i18n: file schemadialog.ui line 467
-#: rc.cpp:183
+#: rc.cpp:186
#, no-c-format
msgid "Max"
msgstr "最强"
#. i18n: file schemadialog.ui line 475
-#: rc.cpp:186
+#: rc.cpp:189
#, no-c-format
msgid "Shade t&o:"
msgstr "滤镜色(&O):"
#. i18n: file schemadialog.ui line 528
-#: rc.cpp:189
+#: rc.cpp:192
#, no-c-format
msgid "Tr&ansparent"
msgstr "透明(&A)"
#. i18n: file sessiondialog.ui line 16
-#: rc.cpp:192
+#: rc.cpp:195
#, no-c-format
msgid "Konsole Session Editor"
msgstr "Konsole 会话编辑器"
#. i18n: file sessiondialog.ui line 59
-#: rc.cpp:198
+#: rc.cpp:201
#, no-c-format
msgid "<Default>"
msgstr "<默认>"
#. i18n: file sessiondialog.ui line 64
-#: rc.cpp:201
+#: rc.cpp:204
#, no-c-format
msgid "Normal"
msgstr "正常"
#. i18n: file sessiondialog.ui line 69
-#: rc.cpp:204
+#: rc.cpp:207
#, no-c-format
msgid "Tiny"
msgstr "很小"
#. i18n: file sessiondialog.ui line 74
-#: rc.cpp:207
+#: rc.cpp:210
#, no-c-format
msgid "Small"
msgstr "小"
#. i18n: file sessiondialog.ui line 79
-#: rc.cpp:210
+#: rc.cpp:213
#, no-c-format
msgid "Medium"
msgstr "中"
#. i18n: file sessiondialog.ui line 84
-#: rc.cpp:213
+#: rc.cpp:216
#, no-c-format
msgid "Large"
msgstr "大"
#. i18n: file sessiondialog.ui line 89
-#: rc.cpp:216
+#: rc.cpp:219
#, no-c-format
msgid "Huge"
msgstr "巨大"
#. i18n: file sessiondialog.ui line 94
-#: rc.cpp:219
+#: rc.cpp:222
#, no-c-format
msgid "Linux"
msgstr "Linux"
#. i18n: file sessiondialog.ui line 99
-#: rc.cpp:222
+#: rc.cpp:225
#, no-c-format
msgid "Unicode"
msgstr "Unicode"
#. i18n: file sessiondialog.ui line 137
-#: rc.cpp:228
+#: rc.cpp:231
#, no-c-format
msgid "&Font:"
msgstr "字体(&F):"
#. i18n: file sessiondialog.ui line 153
-#: rc.cpp:231
+#: rc.cpp:234
#, no-c-format
msgid "S&chema:"
msgstr "方案(&C):"
#. i18n: file sessiondialog.ui line 164
-#: rc.cpp:234
+#: rc.cpp:237
#, no-c-format
msgid "$&TERM:"
msgstr "$&TERM:"
#. i18n: file sessiondialog.ui line 175
-#: rc.cpp:237
+#: rc.cpp:240
#, no-c-format
msgid "&Keytab:"
msgstr "键盘表(&K):"
#. i18n: file sessiondialog.ui line 222
-#: rc.cpp:240
+#: rc.cpp:243
#, no-c-format
msgid "&Icon:"
msgstr "图标(&I):"
#. i18n: file sessiondialog.ui line 238
-#: rc.cpp:243
+#: rc.cpp:246
#, no-c-format
msgid "Session"
msgstr "会话"
#. i18n: file sessiondialog.ui line 262
-#: rc.cpp:246
+#: rc.cpp:249
#, no-c-format
msgid "Sa&ve Session..."
msgstr "保存会话(&V)..."
#. i18n: file sessiondialog.ui line 270
-#: rc.cpp:249
+#: rc.cpp:252
#, no-c-format
msgid "&Remove Session"
msgstr "删除会话(&R)"
#. i18n: file sessiondialog.ui line 307
-#: rc.cpp:252
+#: rc.cpp:255
#, no-c-format
msgid "General"
msgstr "常规"
#. i18n: file sessiondialog.ui line 342
-#: rc.cpp:255
+#: rc.cpp:258
#, no-c-format
msgid "&Name:"
msgstr "名字(&N):"
#. i18n: file sessiondialog.ui line 353
-#: rc.cpp:258
+#: rc.cpp:261
#, no-c-format
msgid "E&xecute:"
msgstr "执行(&X):"
#. i18n: file sessiondialog.ui line 364
-#: rc.cpp:261
+#: rc.cpp:264
#, no-c-format
msgid "&Directory:"
msgstr "目录(&D):"
@@ -715,3 +723,9 @@ msgstr ""
#: sessioneditor.cpp:369
msgid "Error Removing Session"
msgstr "删除会话出错"
+
+#~ msgid "Double Click"
+#~ msgstr "双击"
+
+#~ msgid "Misc"
+#~ msgstr "杂项"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po b/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
index 5ae366b56f0..d02657e5899 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2006-09-29 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-11 01:43+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,14 @@ msgid "Under construction..."
msgstr "建设中..."
#: main.cpp:49
+#, fuzzy
msgid ""
"<h1>Enhanced Browsing</h1> In this module you can configure some enhanced "
"browsing features of TDE. "
"<h2>Internet Keywords</h2>Internet Keywords let you type in the name of a "
"brand, a project, a celebrity, etc... and go to the relevant location. For "
-"example you can just type \"TDE\" or \"K Desktop Environment\" in Konqueror to "
-"go to TDE's homepage."
+"example you can just type \"TDE\" or \"Trinity Desktop Environment\" in "
+"Konqueror to go to TDE's homepage."
"<h2>Web Shortcuts</h2>Web Shortcuts are a quick way of using Web search "
"engines. For example, type \"altavista:frobozz\" or \"av:frobozz\" and "
"Konqueror will do a search on AltaVista for \"frobozz\". Even easier: just "
@@ -306,10 +308,10 @@ msgstr "<qt><b>%1</b> 没有主文件夹。</qt>"
msgid "<qt>There is no user called <b>%1</b>.</qt>"
msgstr "<qt>没有叫做 <b>%1</b> 的用户。</qt>"
-#: plugins/shorturi/tdeshorturifilter.cpp:504
+#: plugins/shorturi/tdeshorturifilter.cpp:526
msgid "<qt>The file or folder <b>%1</b> does not exist."
msgstr "<qt>文件或文件夹 <b>%1</b> 不存在。"
-#: plugins/shorturi/tdeshorturifilter.cpp:521
+#: plugins/shorturi/tdeshorturifilter.cpp:543
msgid "&ShortURLs"
msgstr "快捷网址(&S)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
index beb2188c64e..38542354059 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkwm\n"
-"POT-Creation-Date: 2006-04-11 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 07:26+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,13 @@ msgid "(c) 1997 - 2002 KWin and KControl Authors"
msgstr "(c) 1997 - 2002 KWin 和 KControl 作者"
#: main.cpp:190
+#, fuzzy
msgid ""
"<h1>Window Behavior</h1> Here you can customize the way windows behave when "
"being moved, resized or clicked on. You can also specify a focus policy as well "
"as a placement policy for new windows. "
"<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
"refer to its documentation for how to customize window behavior."
msgstr ""
"<h1>窗口行为</h1>您可以在这里自定义窗口移动、改变大小或被点击时的行为。您可以指定焦点策略和新窗口的放置策略。"
@@ -394,31 +396,31 @@ msgstr "激活、放在前面并移动"
msgid "Resize"
msgstr "更改大小"
-#: windows.cpp:122
+#: windows.cpp:125
msgid "Focus"
msgstr "焦点"
-#: windows.cpp:129
+#: windows.cpp:132
msgid "&Policy:"
msgstr "策略(&P):"
-#: windows.cpp:132
+#: windows.cpp:135
msgid "Click to Focus"
msgstr "点击获取焦点"
-#: windows.cpp:133
+#: windows.cpp:136
msgid "Focus Follows Mouse"
msgstr "焦点跟随鼠标"
-#: windows.cpp:134
+#: windows.cpp:137
msgid "Focus Under Mouse"
msgstr "焦点置于鼠标下"
-#: windows.cpp:135
+#: windows.cpp:138
msgid "Focus Strictly Under Mouse"
msgstr "焦点严格置于鼠标下"
-#: windows.cpp:140
+#: windows.cpp:143
msgid ""
"The focus policy is used to determine the active window, i.e. the window you "
"can work in. "
@@ -447,66 +449,159 @@ msgstr ""
"<li><em>焦点严格置于鼠标下:</em> 这比“焦点置于鼠标下”还差。只有鼠标下的窗口才激活。如果鼠标没有指到任何窗口,则没有窗口拥有焦点。</ul>"
"注意“焦点置于鼠标下”和“焦点严格置于鼠标下”将可能会导致某些特性在 TDE 模式下工作不正常,如 Alt+Tab 窗口浏览对话框。"
-#: windows.cpp:165
+#: windows.cpp:168
msgid "Auto &raise"
msgstr "自动放置在前(&R)"
-#: windows.cpp:170 windows.cpp:183 windows.cpp:546
+#: windows.cpp:173 windows.cpp:186 windows.cpp:645
msgid "Dela&y:"
msgstr "延时(&Y):"
-#: windows.cpp:173 windows.cpp:186 windows.cpp:549 windows.cpp:577
+#: windows.cpp:176 windows.cpp:189 windows.cpp:648 windows.cpp:676
msgid " msec"
msgstr " 毫秒"
-#: windows.cpp:178
+#: windows.cpp:181
msgid "Delay focus"
msgstr "延迟聚焦"
-#: windows.cpp:189
-msgid "C&lick raise active window"
+#: windows.cpp:192
+#, fuzzy
+msgid "Click &raises active window"
msgstr "点击升起激活窗口(&L)"
-#: windows.cpp:196
+#: windows.cpp:199
+#, fuzzy
+msgid "Focus stealing prevention &level:"
+msgstr "避免抢占焦点的程度:"
+
+#: windows.cpp:202
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"None"
+msgstr "无"
+
+#: windows.cpp:203
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Low"
+msgstr "低"
+
+#: windows.cpp:204
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Normal"
+msgstr "普通"
+
+#: windows.cpp:205
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"High"
+msgstr "高"
+
+#: windows.cpp:206
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Extreme"
+msgstr "终极"
+
+#: windows.cpp:209
+#, fuzzy
+msgid ""
+"<p>This option specifies how much TWin will try to prevent unwanted focus "
+"stealing caused by unexpected activation of new windows. (Note: This feature "
+"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
+"policies.)"
+"<ul>"
+"<li><em>None:</em> Prevention is turned off and new windows always become "
+"activated.</li>"
+"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
+"for the underlying mechanism and TWin cannot reliably decide whether to "
+"activate the window or not, it will be activated. This setting may have both "
+"worse and better results than normal level, depending on the applications.</li>"
+"<li><em>Normal:</em> Prevention is enabled.</li>"
+"<li><em>High:</em> New windows get activated only if no window is currently "
+"active or if they belong to the currently active application. This setting is "
+"probably not really usable when not using mouse focus policy.</li>"
+"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
+"</ul></p>"
+"<p>Windows that are prevented from stealing focus are marked as demanding "
+"attention, which by default means their taskbar entry will be highlighted. This "
+"can be changed in the Notifications control module.</p>"
+msgstr ""
+"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意:此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
+"<ul>"
+"<li><em>无:</em>不进行避免,新窗口总是被激活。</li>"
+"<li><em>低:</em>启用避免;如果某些窗口不支持后台规则,且 KWin "
+"无法可靠的确定是否要激活该窗口,则会激活该窗口。这一设置可能比普通级别的效果更差或更好,这取决于具体的应用程序。</li>"
+"<li><em>普通:</em>启用避免;默认设置。</li>"
+"<li><em>高:</em>仅当没有激活窗口或新窗口属于当前应用程序时,才会激活新窗口。如果不使用鼠标聚焦策略的话,这一设置可能不怎么常用。</li>"
+"<li><em>终极:</em>全部窗口都必须由用户显式激活。</li></ul></p>"
+"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
+
+#: windows.cpp:231
msgid ""
"When this option is enabled, a window in the background will automatically come "
"to the front when the mouse pointer has been over it for some time."
msgstr "这个选项启用时,当鼠标光标移动到窗口上一段时间后,在后面背景里的窗口将自动出现在最前面。"
-#: windows.cpp:198
+#: windows.cpp:233
msgid ""
"This is the delay after which the window that the mouse pointer is over will "
"automatically come to the front."
msgstr "当鼠标移动到窗口上后,延迟这么长时间窗口就会自动出现在最前面。"
-#: windows.cpp:202
+#: windows.cpp:237
msgid ""
"When this option is enabled, the active window will be brought to the front "
"when you click somewhere into the window contents. To change it for inactive "
"windows, you need to change the settings in the Actions tab."
msgstr "这个选项启用时,当您点击活动窗口中的内容时,该窗口将会被带到顶层。要更改非活动窗口的特性,您需要在动作标签中更改设置。"
-#: windows.cpp:207
+#: windows.cpp:242
msgid ""
"When this option is enabled, there will be a delay after which the window the "
"mouse pointer is over will become active (receive focus)."
msgstr "启用此选项时,当鼠标移动到窗口上后,延迟一段时间后窗口就会自动出现在最前面(接受焦点)。"
-#: windows.cpp:209
+#: windows.cpp:244
msgid ""
"This is the delay after which the window the mouse pointer is over will "
"automatically receive focus."
msgstr "当鼠标移动到窗口上后,延迟这么长时间窗口就会自动出现在最前面。"
-#: windows.cpp:214
+#: windows.cpp:247
+msgid "S&eparate screen focus"
+msgstr ""
+
+#: windows.cpp:249
+msgid ""
+"When this option is enabled, focus operations are limited only to the active "
+"Xinerama screen"
+msgstr ""
+
+#: windows.cpp:252
+#, fuzzy
+msgid "Active &mouse screen"
+msgstr "激活并放在前面"
+
+#: windows.cpp:254
+msgid ""
+"When this option is enabled, active Xinerama screen (where for example new "
+"windows appear) is the screen with the mouse pointer. When disabled, the active "
+"Xinerama screen is the screen with the focused window. This option is by "
+"default disabled for Click to focus and enabled for other focus policies."
+msgstr ""
+
+#: windows.cpp:270
msgid "Navigation"
msgstr "导航"
-#: windows.cpp:218
+#: windows.cpp:274
msgid "Show window list while switching windows"
msgstr "切换窗口时显示窗口列表"
-#: windows.cpp:221
+#: windows.cpp:277
msgid ""
"Hold down the Alt key and press the Tab key repeatedly to walk through the "
"windows on the current desktop (the Alt+Tab combination can be reconfigured).\n"
@@ -524,173 +619,107 @@ msgstr ""
"\n"
"否则,焦点将转移到新选中的窗口,而不显示弹出部件。此外,先前激活的窗口将会被自动推到最后。"
-#: windows.cpp:233
+#: windows.cpp:289
msgid "&Traverse windows on all desktops"
msgstr "遍历所有桌面上的窗口(&T)"
-#: windows.cpp:236
+#: windows.cpp:292
msgid ""
"Leave this option disabled if you want to limit walking through windows to the "
"current desktop."
msgstr "如果您希望仅限于遍历当前桌面上的窗口,请禁用该选项。"
-#: windows.cpp:240
+#: windows.cpp:296
msgid "Desktop navi&gation wraps around"
msgstr "桌面导航时自动卷绕(&G)"
-#: windows.cpp:243
+#: windows.cpp:299
msgid ""
"Enable this option if you want keyboard or active desktop border navigation "
"beyond the edge of a desktop to take you to the opposite edge of the new "
"desktop."
msgstr "如果您希望用键盘或者鼠标切换桌面时,每当越过边界上的桌面就卷绕到对边上的桌面时,请启用这个选项。"
-#: windows.cpp:247
-msgid "Popup desktop name on desktop &switch"
+#: windows.cpp:303
+#, fuzzy
+msgid "Popup &desktop name on desktop switch"
msgstr "桌面切换时弹出桌面名字(&S)"
-#: windows.cpp:250
+#: windows.cpp:306
msgid ""
"Enable this option if you wish to see the current desktop name popup whenever "
"the current desktop is changed."
msgstr "如果您希望在当前桌面改变后看到桌面的名字弹出来,请启用这个选项。"
-#: windows.cpp:535
+#: windows.cpp:634
msgid "Shading"
msgstr "卷起"
-#: windows.cpp:537
+#: windows.cpp:636
msgid "Anima&te"
msgstr "动画(&T)"
-#: windows.cpp:538
+#: windows.cpp:637
msgid ""
"Animate the action of reducing the window to its titlebar (shading) as well as "
"the expansion of a shaded window"
msgstr "动画显示窗口卷成标题栏和展开恢复成窗口的过程。"
-#: windows.cpp:541
+#: windows.cpp:640
msgid "&Enable hover"
msgstr "悬停展开(&E)"
-#: windows.cpp:551
+#: windows.cpp:650
msgid ""
"If Shade Hover is enabled, a shaded window will un-shade automatically when the "
"mouse pointer has been over the title bar for some time."
msgstr "如果悬停展开被启用,当鼠标指针在标题栏上停留一段时间后,卷起的窗口将自动展开。"
-#: windows.cpp:554
+#: windows.cpp:653
msgid ""
"Sets the time in milliseconds before the window unshades when the mouse pointer "
"goes over the shaded window."
msgstr "设置鼠标指针在卷起的窗口上停留多少毫秒后窗口自动展开。"
-#: windows.cpp:565
+#: windows.cpp:664
msgid "Active Desktop Borders"
msgstr "活动桌面边界"
-#: windows.cpp:568
+#: windows.cpp:667
msgid ""
"If this option is enabled, moving the mouse to a screen border will change your "
"desktop. This is e.g. useful if you want to drag windows from one desktop to "
"the other."
msgstr "这个选项启用时,鼠标移动到屏幕边界将改变您的当前桌面。当您想把窗口拖拽到其它桌面时这特别有用。"
-#: windows.cpp:571
+#: windows.cpp:670
msgid "D&isabled"
msgstr "无效(&I)"
-#: windows.cpp:572
+#: windows.cpp:671
msgid "Only &when moving windows"
msgstr "只在移动窗口时切换桌面(&W)"
-#: windows.cpp:573
+#: windows.cpp:672
msgid "A&lways enabled"
msgstr "总是有效(&L)"
-#: windows.cpp:578
+#: windows.cpp:677
msgid "Desktop &switch delay:"
msgstr "桌面切换延时(&S):"
-#: windows.cpp:579
+#: windows.cpp:678
msgid ""
"Here you can set a delay for switching desktops using the active borders "
"feature. Desktops will be switched after the mouse has been pushed against a "
"screen border for the specified number of milliseconds."
msgstr "这里您可以设置用活动桌面边界切换桌面的延时。当鼠标被推到屏幕边界一定时间(毫秒)后,桌面将自动切换。"
-#: windows.cpp:592
-msgid "Focus stealing prevention level:"
-msgstr "避免抢占焦点的程度:"
-
-#: windows.cpp:594
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"None"
-msgstr "无"
-
-#: windows.cpp:595
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Low"
-msgstr "低"
-
-#: windows.cpp:596
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Normal"
-msgstr "普通"
-
-#: windows.cpp:597
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"High"
-msgstr "高"
-
-#: windows.cpp:598
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Extreme"
-msgstr "终极"
-
-#: windows.cpp:602
-msgid ""
-"<p>This option specifies how much KWin will try to prevent unwanted focus "
-"stealing caused by unexpected activation of new windows. (Note: This feature "
-"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
-"policies.)"
-"<ul>"
-"<li><em>None:</em> Prevention is turned off and new windows always become "
-"activated.</li>"
-"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
-"for the underlying mechanism and KWin cannot reliably decide whether to "
-"activate the window or not, it will be activated. This setting may have both "
-"worse and better results than normal level, depending on the applications.</li>"
-"<li><em>Normal:</em> Prevention is enabled.</li>"
-"<li><em>High:</em> New windows get activated only if no window is currently "
-"active or if they belong to the currently active application. This setting is "
-"probably not really usable when not using mouse focus policy.</li>"
-"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
-"</ul></p>"
-"<p>Windows that are prevented from stealing focus are marked as demanding "
-"attention, which by default means their taskbar entry will be highlighted. This "
-"can be changed in the Notifications control module.</p>"
-msgstr ""
-"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意:此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
-"<ul>"
-"<li><em>无:</em>不进行避免,新窗口总是被激活。</li>"
-"<li><em>低:</em>启用避免;如果某些窗口不支持后台规则,且 KWin "
-"无法可靠的确定是否要激活该窗口,则会激活该窗口。这一设置可能比普通级别的效果更差或更好,这取决于具体的应用程序。</li>"
-"<li><em>普通:</em>启用避免;默认设置。</li>"
-"<li><em>高:</em>仅当没有激活窗口或新窗口属于当前应用程序时,才会激活新窗口。如果不使用鼠标聚焦策略的话,这一设置可能不怎么常用。</li>"
-"<li><em>终极:</em>全部窗口都必须由用户显式激活。</li></ul></p>"
-"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
-
-#: windows.cpp:625
+#: windows.cpp:690
msgid "Hide utility windows for inactive applications"
msgstr "隐藏非活动应用程序的工具窗口"
-#: windows.cpp:627
+#: windows.cpp:692
msgid ""
"When turned on, utility windows (tool windows, torn-off menus,...) of inactive "
"applications will be hidden and will be shown only when the application becomes "
@@ -699,106 +728,106 @@ msgid ""
msgstr ""
"开启时,非活动应用程序的工具窗口(工具栏、私下的菜单)将被隐藏,而且仅当应用程序活动时才显示。请注意,要让此特性工作正常,应用程序必须将正确设定相应窗口的类型。"
-#: windows.cpp:780
+#: windows.cpp:834
msgid "Windows"
msgstr "窗口"
-#: windows.cpp:788
+#: windows.cpp:842
msgid "Di&splay content in moving windows"
msgstr "移动窗口时显示内容(&S)"
-#: windows.cpp:790
+#: windows.cpp:844
msgid ""
"Enable this option if you want a window's content to be fully shown while "
"moving it, instead of just showing a window 'skeleton'. The result may not be "
"satisfying on slow machines without graphic acceleration."
msgstr "如果您希望移动窗口时显示它完整的内容,而不是仅显示一个“框架”,请启用这个选项。在没有图形加速的慢机器上,效果可能不令人满意。"
-#: windows.cpp:794
+#: windows.cpp:848
msgid "Display content in &resizing windows"
msgstr "改变窗口大小时显示内容(&R)"
-#: windows.cpp:796
+#: windows.cpp:850
msgid ""
"Enable this option if you want a window's content to be shown while resizing "
"it, instead of just showing a window 'skeleton'. The result may not be "
"satisfying on slow machines."
msgstr "如果您希望改变窗口大小时显示窗口的内容,而不是仅显示一个“框架”,请启用这个选项。在慢速的机器上,效果可能不令人满意。"
-#: windows.cpp:800
+#: windows.cpp:854
msgid "Display window &geometry when moving or resizing"
msgstr "移动或者改变大小时显示窗口几何尺寸(&G)"
-#: windows.cpp:802
+#: windows.cpp:856
msgid ""
"Enable this option if you want a window's geometry to be displayed while it is "
"being moved or resized. The window position relative to the top-left corner of "
"the screen is displayed together with its size."
msgstr "如果您要在移动或者改变大小时显示窗口几何尺寸,请启用此项。相对于屏幕左上角的窗口位置及其大小将会在移动时显示。"
-#: windows.cpp:812
+#: windows.cpp:866
msgid "Animate minimi&ze and restore"
msgstr "动画显示最小化和恢复(&Z)"
-#: windows.cpp:814
+#: windows.cpp:868
msgid ""
"Enable this option if you want an animation shown when windows are minimized or "
"restored."
msgstr "如果您希望最小化或恢复窗口时显示动画,请启用此选项。"
-#: windows.cpp:828
+#: windows.cpp:882
msgid "Slow"
msgstr "慢"
-#: windows.cpp:832
+#: windows.cpp:886
msgid "Fast"
msgstr "快"
-#: windows.cpp:836
+#: windows.cpp:890
msgid ""
"Here you can set the speed of the animation shown when windows are minimized "
"and restored. "
msgstr "您可以设置窗口最小化和恢复时的动画的速度。"
-#: windows.cpp:842
+#: windows.cpp:896
msgid "Allow moving and resizing o&f maximized windows"
msgstr "允许移动和改变最大化窗口的大小(&F)"
-#: windows.cpp:844
+#: windows.cpp:898
msgid ""
"When enabled, this feature activates the border of maximized windows and allows "
"you to move or resize them, just like for normal windows"
msgstr "启用时,该特性激活最大化窗口的边框,允许您移动或改变它们的大小,就象普通窗口一样。"
-#: windows.cpp:850
+#: windows.cpp:904
msgid "&Placement:"
msgstr "放置策略(&P):"
-#: windows.cpp:853
+#: windows.cpp:907
msgid "Smart"
msgstr "智能"
-#: windows.cpp:854
+#: windows.cpp:908
msgid "Maximizing"
msgstr "最大化"
-#: windows.cpp:855
+#: windows.cpp:909
msgid "Cascade"
msgstr "层叠"
-#: windows.cpp:856
+#: windows.cpp:910
msgid "Random"
msgstr "随机"
-#: windows.cpp:857
+#: windows.cpp:911
msgid "Centered"
msgstr "居中"
-#: windows.cpp:858
+#: windows.cpp:912
msgid "Zero-Cornered"
msgstr "边角"
-#: windows.cpp:865
+#: windows.cpp:919
msgid ""
"The placement policy determines where a new window will appear on the desktop. "
"<ul> "
@@ -821,58 +850,59 @@ msgstr ""
"<li><em>居中</em> 将把窗口居中放置</li> "
"<li><em>边角</em> 将把窗口放在左上角</li></ul>"
-#: windows.cpp:904
+#: windows.cpp:958
msgid "Snap Zones"
msgstr "吸引区"
-#: windows.cpp:908 windows.cpp:917
+#: windows.cpp:962 windows.cpp:971
msgid "none"
msgstr "无"
-#: windows.cpp:910
+#: windows.cpp:964
msgid "&Border snap zone:"
msgstr "边界吸引区(&B):"
-#: windows.cpp:912
+#: windows.cpp:966
msgid ""
"Here you can set the snap zone for screen borders, i.e. the 'strength' of the "
"magnetic field which will make windows snap to the border when moved near it."
msgstr "您可以设置屏幕边界的吸引区,即磁场的“吸引力”,它使窗口移近边界时被吸引到边界上。"
-#: windows.cpp:919
+#: windows.cpp:973
msgid "&Window snap zone:"
msgstr "窗口吸引区(&W):"
-#: windows.cpp:921
+#: windows.cpp:975
msgid ""
"Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic "
"field which will make windows snap to each other when they're moved near "
"another window."
msgstr "您可以设置窗口的吸引区,即磁场的“吸引力”,它使窗口移近另外的窗口时彼此吸引到一起。"
-#: windows.cpp:925
+#: windows.cpp:979
msgid "Snap windows onl&y when overlapping"
msgstr "仅在重叠时才吸引窗口(&Y)"
-#: windows.cpp:926
+#: windows.cpp:980
msgid ""
"Here you can set that windows will be only snapped if you try to overlap them, "
"i.e. they will not be snapped if the windows comes only near another window or "
"border."
msgstr "您可以在这里设置窗口只在重叠时才将它们的边界吸引到一起。即,如果它们只是相互靠近或者靠近屏幕边沿但尚未重叠,则不相互吸引。"
-#: windows.cpp:1023 windows.cpp:1027
+#: windows.cpp:1077 windows.cpp:1081
msgid ""
"_n: pixel\n"
" pixels"
msgstr " 像素"
-#: windows.cpp:1226
+#: windows.cpp:1280
+#, fuzzy
msgid ""
"<qt><b>It seems that alpha channel support is not available.</b>"
"<br>"
"<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
+"Xorg &ge; 6.8</a>, and installed the composition manager that came with twin."
"<br>Also, make sure you have the following entries in your XConfig (e.g. "
"/etc/X11/xorg.conf):"
"<br>"
@@ -901,107 +931,134 @@ msgstr ""
"<br><i>Option \"RenderAccel\" \"true\"</i>"
"<br>In <i>Section \"Device\"</i></qt>"
-#: windows.cpp:1246
+#: windows.cpp:1300
msgid "Apply translucency only to decoration"
msgstr "透明度仅适用于装饰"
-#: windows.cpp:1254
+#: windows.cpp:1308
msgid "Active windows:"
msgstr "活动窗口:"
-#: windows.cpp:1261
+#: windows.cpp:1315
msgid "Inactive windows:"
msgstr "非活动窗口:"
-#: windows.cpp:1268
+#: windows.cpp:1322
msgid "Moving windows:"
msgstr "移动窗口:"
-#: windows.cpp:1275
+#: windows.cpp:1329
msgid "Dock windows:"
msgstr "停靠窗口:"
-#: windows.cpp:1284
+#: windows.cpp:1338
msgid "Treat 'keep above' windows as active ones"
msgstr "将“常居顶端”的窗口当作活动窗口"
-#: windows.cpp:1287
+#: windows.cpp:1341
msgid "Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"
msgstr "禁止 ARGB 窗口(忽略窗口的 alpha 映射,适用于 gtk1 应用程序)"
-#: windows.cpp:1291
+#: windows.cpp:1347
+msgid "Use OpenGL compositor (best performance)"
+msgstr ""
+
+#: windows.cpp:1354
msgid "Opacity"
msgstr "不透明度"
-#: windows.cpp:1297
-msgid "Use shadows"
-msgstr "使用阴影"
+#: windows.cpp:1360
+msgid ""
+"Use shadows (standard effects should be disabled in the Styles module if this "
+"is checked)"
+msgstr ""
-#: windows.cpp:1305
-msgid "Active window size:"
-msgstr "活动窗口大小:"
+#: windows.cpp:1368
+#, fuzzy
+msgid "Base shadow radius:"
+msgstr "使用阴影"
-#: windows.cpp:1312
-msgid "Inactive window size:"
+#: windows.cpp:1375
+#, fuzzy
+msgid "Inactive window distance from background:"
msgstr "非活动窗口大小:"
-#: windows.cpp:1319
-msgid "Dock window size:"
-msgstr "停靠窗口大小:"
+#: windows.cpp:1382
+msgid "Active window distance from background:"
+msgstr ""
-#: windows.cpp:1326
+#: windows.cpp:1389
+msgid "Dock distance from background:"
+msgstr ""
+
+#: windows.cpp:1396
+msgid "Menu distance from background:"
+msgstr ""
+
+#: windows.cpp:1409
msgid "Vertical offset:"
msgstr "垂直偏移:"
-#: windows.cpp:1333
+#: windows.cpp:1416
msgid "Horizontal offset:"
msgstr "水平偏移:"
-#: windows.cpp:1340
+#: windows.cpp:1423
msgid "Shadow color:"
msgstr "阴影颜色:"
-#: windows.cpp:1346
+#: windows.cpp:1429
msgid "Remove shadows on move"
msgstr "移动时去掉阴影"
-#: windows.cpp:1348
+#: windows.cpp:1431
msgid "Remove shadows on resize"
msgstr "缩放时去掉阴影"
-#: windows.cpp:1351
+#: windows.cpp:1434
msgid "Shadows"
msgstr "阴影"
-#: windows.cpp:1356
+#: windows.cpp:1439
msgid "Fade-in windows (including popups)"
msgstr "淡入窗口(包括弹出窗口)"
-#: windows.cpp:1357
+#: windows.cpp:1440
+msgid ""
+"Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
+msgstr ""
+
+#: windows.cpp:1441
msgid "Fade between opacity changes"
msgstr "不透明度更改时淡入淡出"
-#: windows.cpp:1360
+#: windows.cpp:1444
msgid "Fade-in speed:"
msgstr "淡入速度:"
-#: windows.cpp:1363
+#: windows.cpp:1447
msgid "Fade-out speed:"
msgstr "淡出速度:"
-#: windows.cpp:1370
+#: windows.cpp:1455
msgid "Effects"
msgstr "效果"
-#: windows.cpp:1372
-msgid "Use translucency/shadows"
-msgstr "使用透明/阴影"
+#: windows.cpp:1457
+msgid "Enable the Trinity window composition manager"
+msgstr ""
-#: windows.cpp:1624
-msgid ""
-"<qt>Translucency support is new and may cause problems"
-"<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
-msgstr "<qt>透明支持是新特性,可能造成各种问题,甚至崩溃(有时是透明引擎崩溃,少数情况下 X 也会崩溃)。</qt>"
+#~ msgid "Active window size:"
+#~ msgstr "活动窗口大小:"
+
+#~ msgid "Dock window size:"
+#~ msgstr "停靠窗口大小:"
+
+#~ msgid "Use translucency/shadows"
+#~ msgstr "使用透明/阴影"
+
+#~ msgid "<qt>Translucency support is new and may cause problems<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
+#~ msgstr "<qt>透明支持是新特性,可能造成各种问题,甚至崩溃(有时是透明引擎崩溃,少数情况下 X 也会崩溃)。</qt>"
#~ msgid " pixels"
#~ msgstr " 像素"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po b/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
index 8fe22fafec8..356c1123f0e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmlaunch\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:38+0800\n"
"Last-Translator: Lou Bingyong <loubingyong@hotmail.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po b/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
index 03e0a9f67a4..601b3d2f4b7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
@@ -6,548 +6,549 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-12-03 21:54+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kcmlayout.cpp:563
+#: kcmlayout.cpp:566
msgid "None"
msgstr "无"
-#: kcmlayout.cpp:832
+#: kcmlayout.cpp:835
msgid "Brazilian ABNT2"
msgstr "巴西 ABNT2"
-#: kcmlayout.cpp:833
+#: kcmlayout.cpp:836
msgid "Dell 101-key PC"
msgstr "Dell 101-键 PC"
-#: kcmlayout.cpp:834
+#: kcmlayout.cpp:837
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: kcmlayout.cpp:835
+#: kcmlayout.cpp:838
msgid "Generic 101-key PC"
msgstr "通用 101 键 PC"
-#: kcmlayout.cpp:836
+#: kcmlayout.cpp:839
msgid "Generic 102-key (Intl) PC"
msgstr "通用 102 键 (Intl)PC"
-#: kcmlayout.cpp:837
+#: kcmlayout.cpp:840
msgid "Generic 104-key PC"
msgstr "通用 104 键 PC"
-#: kcmlayout.cpp:838
+#: kcmlayout.cpp:841
msgid "Generic 105-key (Intl) PC"
msgstr "通用 105 键 (Intl)PC"
-#: kcmlayout.cpp:839
+#: kcmlayout.cpp:842
msgid "Japanese 106-key"
msgstr "日本 106 键"
-#: kcmlayout.cpp:840
+#: kcmlayout.cpp:843
msgid "Microsoft Natural"
msgstr "微软自然键盘"
-#: kcmlayout.cpp:841
+#: kcmlayout.cpp:844
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: kcmlayout.cpp:842
+#: kcmlayout.cpp:845
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: kcmlayout.cpp:843
+#: kcmlayout.cpp:846
msgid "Winbook Model XP5"
msgstr "Winbook XP5 型"
-#: kcmlayout.cpp:846
+#: kcmlayout.cpp:849
msgid "Group Shift/Lock behavior"
msgstr "组切换/锁定行为"
-#: kcmlayout.cpp:847
+#: kcmlayout.cpp:850
msgid "R-Alt switches group while pressed"
msgstr "按右 Alt 键切换组"
-#: kcmlayout.cpp:848
+#: kcmlayout.cpp:851
msgid "Right Alt key changes group"
msgstr "右边的 Alt 键改变组"
-#: kcmlayout.cpp:849
+#: kcmlayout.cpp:852
msgid "Caps Lock key changes group"
msgstr "Caps Lock 键改变组"
-#: kcmlayout.cpp:850
+#: kcmlayout.cpp:853
msgid "Menu key changes group"
msgstr "菜单键改变组"
-#: kcmlayout.cpp:851
+#: kcmlayout.cpp:854
msgid "Both Shift keys together change group"
msgstr "两个 Shift 键一起按改变组"
-#: kcmlayout.cpp:852
+#: kcmlayout.cpp:855
msgid "Control+Shift changes group"
msgstr "Ctrl+Shift 改变组"
-#: kcmlayout.cpp:853
+#: kcmlayout.cpp:856
msgid "Alt+Control changes group"
msgstr "Alt+Ctrl 改变组"
-#: kcmlayout.cpp:854
+#: kcmlayout.cpp:857
msgid "Alt+Shift changes group"
msgstr "Alt+Shift 改变组"
-#: kcmlayout.cpp:855
+#: kcmlayout.cpp:858
msgid "Control Key Position"
msgstr "Ctrl 键位置"
-#: kcmlayout.cpp:856
+#: kcmlayout.cpp:859
msgid "Make CapsLock an additional Control"
msgstr "用 CapsLock 键作附加控制"
-#: kcmlayout.cpp:857
+#: kcmlayout.cpp:860
msgid "Swap Control and Caps Lock"
msgstr "交换 Ctrl 和 Caps Lock 键"
-#: kcmlayout.cpp:858
+#: kcmlayout.cpp:861
msgid "Control key at left of 'A'"
msgstr "Ctrl 键在字母“A” 左边"
-#: kcmlayout.cpp:859
+#: kcmlayout.cpp:862
msgid "Control key at bottom left"
msgstr "Ctrl 键在左下角"
-#: kcmlayout.cpp:860
+#: kcmlayout.cpp:863
msgid "Use keyboard LED to show alternative group"
msgstr "用键盘 LED 小灯显示另外的组"
-#: kcmlayout.cpp:861
+#: kcmlayout.cpp:864
msgid "Num_Lock LED shows alternative group"
msgstr "Num Lock LED 灯显示另外的组"
-#: kcmlayout.cpp:862
+#: kcmlayout.cpp:865
msgid "Caps_Lock LED shows alternative group"
msgstr "Caps Lock LED 灯显示另外的组"
-#: kcmlayout.cpp:863
+#: kcmlayout.cpp:866
msgid "Scroll_Lock LED shows alternative group"
msgstr "Scroll Lock LED 灯显示另外的组"
-#: kcmlayout.cpp:866
+#: kcmlayout.cpp:869
msgid "Left Win-key switches group while pressed"
msgstr "按左边的 Windows 键切换组"
-#: kcmlayout.cpp:867
+#: kcmlayout.cpp:870
msgid "Right Win-key switches group while pressed"
msgstr "按右边的 Windows 键切换组"
-#: kcmlayout.cpp:868
+#: kcmlayout.cpp:871
msgid "Both Win-keys switch group while pressed"
msgstr "按任一个 Windows 键切换组"
-#: kcmlayout.cpp:869
+#: kcmlayout.cpp:872
msgid "Left Win-key changes group"
msgstr "左 Windows 键改变组"
-#: kcmlayout.cpp:870
+#: kcmlayout.cpp:873
msgid "Right Win-key changes group"
msgstr "右 Windows 键改变组"
-#: kcmlayout.cpp:871
+#: kcmlayout.cpp:874
msgid "Third level choosers"
msgstr "第三级选择"
-#: kcmlayout.cpp:872
+#: kcmlayout.cpp:875
msgid "Press Right Control to choose 3rd level"
msgstr "按右 Ctrl 选择第三级"
-#: kcmlayout.cpp:873
+#: kcmlayout.cpp:876
msgid "Press Menu key to choose 3rd level"
msgstr "按菜单键选择第三级"
-#: kcmlayout.cpp:874
+#: kcmlayout.cpp:877
msgid "Press any of Win-keys to choose 3rd level"
msgstr "按任一 Windows 键选择第三级"
-#: kcmlayout.cpp:875
+#: kcmlayout.cpp:878
msgid "Press Left Win-key to choose 3rd level"
msgstr "按左 Windows 键选择第三级"
-#: kcmlayout.cpp:876
+#: kcmlayout.cpp:879
msgid "Press Right Win-key to choose 3rd level"
msgstr "按右 Windows 键选择第三级"
-#: kcmlayout.cpp:877
+#: kcmlayout.cpp:880
msgid "CapsLock key behavior"
msgstr "CapsLock 键行为"
-#: kcmlayout.cpp:878
+#: kcmlayout.cpp:881
msgid "uses internal capitalization. Shift cancels Caps."
msgstr "用内部的大写切换,Shift 键取消大写。"
-#: kcmlayout.cpp:879
+#: kcmlayout.cpp:882
msgid "uses internal capitalization. Shift doesn't cancel Caps."
msgstr "用内部的大写切换,Shift 键不取消大写。"
-#: kcmlayout.cpp:880
+#: kcmlayout.cpp:883
msgid "acts as Shift with locking. Shift cancels Caps."
msgstr "如同锁定 Shift,Shift 取消大写。"
-#: kcmlayout.cpp:881
+#: kcmlayout.cpp:884
msgid "acts as Shift with locking. Shift doesn't cancel Caps."
msgstr "如同锁定 Shift,Shift 不取消大写。"
-#: kcmlayout.cpp:882
+#: kcmlayout.cpp:885
msgid "Alt/Win key behavior"
msgstr "Alt/Windows 键行为"
-#: kcmlayout.cpp:883
+#: kcmlayout.cpp:886
msgid "Add the standard behavior to Menu key."
msgstr "给菜单键附加标准行为。"
-#: kcmlayout.cpp:884
+#: kcmlayout.cpp:887
msgid "Alt and Meta on the Alt keys (default)."
msgstr "Alt 和 Meta 都用 Alt 键 (缺省)。"
-#: kcmlayout.cpp:885
+#: kcmlayout.cpp:888
msgid "Meta is mapped to the Win-keys."
msgstr "Meta 映射到 Windows 键。"
-#: kcmlayout.cpp:886
+#: kcmlayout.cpp:889
msgid "Meta is mapped to the left Win-key."
msgstr "Meta 映射到左 Windows 键。"
-#: kcmlayout.cpp:887
+#: kcmlayout.cpp:890
msgid "Super is mapped to the Win-keys (default)."
msgstr "Super 映射到 Windows 键 (缺省)。"
-#: kcmlayout.cpp:888
+#: kcmlayout.cpp:891
msgid "Hyper is mapped to the Win-keys."
msgstr "Hyper 映射到 Windows 键。"
-#: kcmlayout.cpp:889
+#: kcmlayout.cpp:892
msgid "Right Alt is Compose"
msgstr "右边 Alt 键作 Compose"
-#: kcmlayout.cpp:890
+#: kcmlayout.cpp:893
msgid "Right Win-key is Compose"
msgstr "右边的 Windows 键作 Compose"
-#: kcmlayout.cpp:891
+#: kcmlayout.cpp:894
msgid "Menu is Compose"
msgstr "菜单键作 Compose"
-#: kcmlayout.cpp:894
+#: kcmlayout.cpp:897
msgid "Both Ctrl keys together change group"
msgstr "两个 Ctrl 键一起按改变组"
-#: kcmlayout.cpp:895
+#: kcmlayout.cpp:898
msgid "Both Alt keys together change group"
msgstr "两个 Alt 键一起按改变组"
-#: kcmlayout.cpp:896
+#: kcmlayout.cpp:899
msgid "Left Shift key changes group"
msgstr "左 Shift 键改变组"
-#: kcmlayout.cpp:897
+#: kcmlayout.cpp:900
msgid "Right Shift key changes group"
msgstr "右 Shift 键改变组"
-#: kcmlayout.cpp:898
+#: kcmlayout.cpp:901
msgid "Right Ctrl key changes group"
msgstr "右 Ctrl 键改变组"
-#: kcmlayout.cpp:899
+#: kcmlayout.cpp:902
msgid "Left Alt key changes group"
msgstr "左 Alt 键改变组"
-#: kcmlayout.cpp:900
+#: kcmlayout.cpp:903
msgid "Left Ctrl key changes group"
msgstr "左 Ctrl 键改变组"
-#: kcmlayout.cpp:901
+#: kcmlayout.cpp:904
msgid "Compose Key"
msgstr "Compose 键"
-#: kcmlayout.cpp:904
+#: kcmlayout.cpp:907
msgid "Shift with numpad keys works as in MS Windows."
msgstr "Shift+数字键盘与 Windows 工作方式相同。"
-#: kcmlayout.cpp:905
+#: kcmlayout.cpp:908
msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
msgstr "特殊键(Ctrl+Alt+<键>)在服务器中处理。"
-#: kcmlayout.cpp:906
+#: kcmlayout.cpp:909
msgid "Miscellaneous compatibility options"
msgstr "杂类兼容性选项"
-#: kcmlayout.cpp:907
+#: kcmlayout.cpp:910
msgid "Right Control key works as Right Alt"
msgstr "右 Ctrl 与右 Alt 键等价"
-#: kcmlayout.cpp:910
+#: kcmlayout.cpp:913
msgid "Right Alt key switches group while pressed"
msgstr "右边的 Alt 键切换组"
-#: kcmlayout.cpp:911
+#: kcmlayout.cpp:914
msgid "Left Alt key switches group while pressed"
msgstr "左边的 Alt 键切换组"
-#: kcmlayout.cpp:912
+#: kcmlayout.cpp:915
msgid "Press Right Alt-key to choose 3rd level"
msgstr "右 Alt 键选择第三级"
-#: kcmlayout.cpp:915
+#: kcmlayout.cpp:918
msgid "R-Alt switches group while pressed."
msgstr "右 Alt 键切换组。"
-#: kcmlayout.cpp:916
+#: kcmlayout.cpp:919
msgid "Left Alt key switches group while pressed."
msgstr "左边的 Alt 键切换组。"
-#: kcmlayout.cpp:917
+#: kcmlayout.cpp:920
msgid "Left Win-key switches group while pressed."
msgstr "左边的 Windows 键切换组。"
-#: kcmlayout.cpp:918
+#: kcmlayout.cpp:921
msgid "Right Win-key switches group while pressed."
msgstr "右边的 Windows 键切换组。"
-#: kcmlayout.cpp:919
+#: kcmlayout.cpp:922
msgid "Both Win-keys switch group while pressed."
msgstr "任一个 Windows 键切换组。"
-#: kcmlayout.cpp:920
+#: kcmlayout.cpp:923
msgid "Right Ctrl key switches group while pressed."
msgstr "右边的 Alt 键切换组。"
-#: kcmlayout.cpp:921
+#: kcmlayout.cpp:924
msgid "Right Alt key changes group."
msgstr "右边的 Alt 键改变组。"
-#: kcmlayout.cpp:922
+#: kcmlayout.cpp:925
msgid "Left Alt key changes group."
msgstr "左 Alt 键改变组。"
-#: kcmlayout.cpp:923
+#: kcmlayout.cpp:926
msgid "CapsLock key changes group."
msgstr "Caps Lock 键改变组。"
-#: kcmlayout.cpp:924
+#: kcmlayout.cpp:927
msgid "Shift+CapsLock changes group."
msgstr "Shift+Caps Lock 键改变组。"
-#: kcmlayout.cpp:925
+#: kcmlayout.cpp:928
msgid "Both Shift keys together change group."
msgstr "两个 Shift 键一起按改变组。"
-#: kcmlayout.cpp:926
+#: kcmlayout.cpp:929
msgid "Both Alt keys together change group."
msgstr "两个 Alt 键一起按改变组。"
-#: kcmlayout.cpp:927
+#: kcmlayout.cpp:930
msgid "Both Ctrl keys together change group."
msgstr "两个 Ctrl 键一起按改变组。"
-#: kcmlayout.cpp:928
+#: kcmlayout.cpp:931
msgid "Ctrl+Shift changes group."
msgstr "Ctrl+Shift 改变组。"
-#: kcmlayout.cpp:929
+#: kcmlayout.cpp:932
msgid "Alt+Ctrl changes group."
msgstr "Alt+Ctrl 改变组。"
-#: kcmlayout.cpp:930
+#: kcmlayout.cpp:933
msgid "Alt+Shift changes group."
msgstr "Alt+Shift 改变组。"
-#: kcmlayout.cpp:931
+#: kcmlayout.cpp:934
msgid "Menu key changes group."
msgstr "菜单键改变组。"
-#: kcmlayout.cpp:932
+#: kcmlayout.cpp:935
msgid "Left Win-key changes group."
msgstr "左 Windows 键改变组。"
-#: kcmlayout.cpp:933
+#: kcmlayout.cpp:936
msgid "Right Win-key changes group."
msgstr "右 Windows 键改变组。"
-#: kcmlayout.cpp:934
+#: kcmlayout.cpp:937
msgid "Left Shift key changes group."
msgstr "左 Shift 键改变组。"
-#: kcmlayout.cpp:935
+#: kcmlayout.cpp:938
msgid "Right Shift key changes group."
msgstr "右 Shift 键改变组。"
-#: kcmlayout.cpp:936
+#: kcmlayout.cpp:939
msgid "Left Ctrl key changes group."
msgstr "左 Ctrl 键改变组。"
-#: kcmlayout.cpp:937
+#: kcmlayout.cpp:940
msgid "Right Ctrl key changes group."
msgstr "右 Ctrl 键改变组。"
-#: kcmlayout.cpp:938
+#: kcmlayout.cpp:941
msgid "Press Right Ctrl to choose 3rd level."
msgstr "按右 Ctrl 选择第三级。"
-#: kcmlayout.cpp:939
+#: kcmlayout.cpp:942
msgid "Press Menu key to choose 3rd level."
msgstr "按菜单键选择第三级。"
-#: kcmlayout.cpp:940
+#: kcmlayout.cpp:943
msgid "Press any of Win-keys to choose 3rd level."
msgstr "按任一 Windows 键选择第三级。"
-#: kcmlayout.cpp:941
+#: kcmlayout.cpp:944
msgid "Press Left Win-key to choose 3rd level."
msgstr "按左 Windows 键选择第三级。"
-#: kcmlayout.cpp:942
+#: kcmlayout.cpp:945
msgid "Press Right Win-key to choose 3rd level."
msgstr "按右 Windows 键选择第三级。"
-#: kcmlayout.cpp:943
+#: kcmlayout.cpp:946
msgid "Press any of Alt keys to choose 3rd level."
msgstr "按任一 Alt 键选择第三级。"
-#: kcmlayout.cpp:944
+#: kcmlayout.cpp:947
msgid "Press Left Alt key to choose 3rd level."
msgstr "按左 Alt 键选择第三级。"
-#: kcmlayout.cpp:945
+#: kcmlayout.cpp:948
msgid "Press Right Alt key to choose 3rd level."
msgstr "按右 Alt 键选择第三级。"
-#: kcmlayout.cpp:946
+#: kcmlayout.cpp:949
msgid "Ctrl key position"
msgstr "Ctrl 键位置"
-#: kcmlayout.cpp:947
+#: kcmlayout.cpp:950
msgid "Make CapsLock an additional Ctrl."
msgstr "用 CapsLock 键作附加控制。"
-#: kcmlayout.cpp:948
+#: kcmlayout.cpp:951
msgid "Swap Ctrl and CapsLock."
msgstr "交换 Ctrl 和 Caps Lock 键。"
-#: kcmlayout.cpp:949
+#: kcmlayout.cpp:952
msgid "Ctrl key at left of 'A'"
msgstr "Ctrl 键在字母“A” 左边"
-#: kcmlayout.cpp:950
+#: kcmlayout.cpp:953
msgid "Ctrl key at bottom left"
msgstr "Ctrl 键在左下角"
-#: kcmlayout.cpp:951
+#: kcmlayout.cpp:954
msgid "Right Ctrl key works as Right Alt."
msgstr "右 Ctrl 与右 Alt 键等价。"
-#: kcmlayout.cpp:952
+#: kcmlayout.cpp:955
msgid "Use keyboard LED to show alternative group."
msgstr "用键盘 LED 小灯显示另外的组。"
-#: kcmlayout.cpp:953
+#: kcmlayout.cpp:956
msgid "NumLock LED shows alternative group."
msgstr "Num Lock LED 灯显示另外的组。"
-#: kcmlayout.cpp:954
+#: kcmlayout.cpp:957
msgid "CapsLock LED shows alternative group."
msgstr "Caps Lock LED 灯显示另外的组。"
-#: kcmlayout.cpp:955
+#: kcmlayout.cpp:958
msgid "ScrollLock LED shows alternative group."
msgstr "Scroll Lock LED 灯显示另外的组。"
-#: kcmlayout.cpp:956
+#: kcmlayout.cpp:959
msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
msgstr "CapsLock 使用内部大写切换。Shift 键取消大写。"
-#: kcmlayout.cpp:957
+#: kcmlayout.cpp:960
msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
msgstr "CapsLock 使用内部大写切换。Shift 键不取消大写。"
-#: kcmlayout.cpp:958
+#: kcmlayout.cpp:961
msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
msgstr "CapsLock 如同锁定 Shift。Shift 取消大写。"
-#: kcmlayout.cpp:959
+#: kcmlayout.cpp:962
msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
msgstr "CapsLock 如同锁定 Shift。Shift 不取消大写。"
-#: kcmlayout.cpp:960
+#: kcmlayout.cpp:963
msgid "CapsLock just locks the Shift modifier."
msgstr ""
-#: kcmlayout.cpp:961
+#: kcmlayout.cpp:964
msgid "CapsLock toggles normal capitalization of alphabetic characters."
msgstr ""
-#: kcmlayout.cpp:962
+#: kcmlayout.cpp:965
msgid "CapsLock toggles Shift so all keys are affected."
msgstr ""
-#: kcmlayout.cpp:963
+#: kcmlayout.cpp:966
#, fuzzy
msgid "Alt and Meta are on the Alt keys (default)."
msgstr "Alt 和 Meta 都用 Alt 键 (缺省)。"
-#: kcmlayout.cpp:964
+#: kcmlayout.cpp:967
#, fuzzy
msgid "Alt is mapped to the right Win-key and Super to Menu."
msgstr "Meta 映射到左 Windows 键。"
-#: kcmlayout.cpp:965
+#: kcmlayout.cpp:968
msgid "Compose key position"
msgstr "组合键位置"
-#: kcmlayout.cpp:966
+#: kcmlayout.cpp:969
msgid "Right Alt is Compose."
msgstr "右边 Alt 键作组合键。"
-#: kcmlayout.cpp:967
+#: kcmlayout.cpp:970
#, fuzzy
msgid "Right Win-key is Compose."
msgstr "右边的 Windows 键作 Compose"
-#: kcmlayout.cpp:968
+#: kcmlayout.cpp:971
#, fuzzy
msgid "Menu is Compose."
msgstr "菜单键作 Compose"
-#: kcmlayout.cpp:969
+#: kcmlayout.cpp:972
msgid "Right Ctrl is Compose."
msgstr "右边 Ctrl 键作 Compose。"
-#: kcmlayout.cpp:970
+#: kcmlayout.cpp:973
msgid "Caps Lock is Compose."
msgstr "Caps Lock 键作 Compose。"
-#: kcmlayout.cpp:971
+#: kcmlayout.cpp:974
#, fuzzy
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
msgstr "特殊键(Ctrl+Alt+<键>)在服务器中处理。"
-#: kcmlayout.cpp:972
+#: kcmlayout.cpp:975
msgid "Adding the EuroSign to certain keys"
msgstr ""
-#: kcmlayout.cpp:973
+#: kcmlayout.cpp:976
msgid "Add the EuroSign to the E key."
msgstr ""
-#: kcmlayout.cpp:974
+#: kcmlayout.cpp:977
msgid "Add the EuroSign to the 5 key."
msgstr ""
-#: kcmlayout.cpp:975
+#: kcmlayout.cpp:978
msgid "Add the EuroSign to the 2 key."
msgstr ""
@@ -1333,14 +1334,31 @@ msgid ""
"succession: Tab characters continue to be emitted until you release the key."
msgstr "如果您使用该选项,按住一个键将不断产生同样字符。例如,按住 Tab 键和连续多次按该键的效果一样:Tab 字符不断输入直到您放开该按键。"
-#. i18n: file kcmmiscwidget.ui line 263
+#. i18n: file kcmmiscwidget.ui line 252
#: rc.cpp:191
#, no-c-format
+msgid "Use &BIOS settings"
+msgstr ""
+
+#. i18n: file kcmmiscwidget.ui line 258
+#: rc.cpp:194
+#, fuzzy, no-c-format
+msgid ""
+"If you check this option, pressing and holding down a key emits the same "
+"character over and over again as set in the BIOS. For example, pressing and "
+"holding down the Tab key will have the same effect as that of pressing that key "
+"several times in succession: Tab characters continue to be emitted until you "
+"release the key."
+msgstr "如果您使用该选项,按住一个键将不断产生同样字符。例如,按住 Tab 键和连续多次按该键的效果一样:Tab 字符不断输入直到您放开该按键。"
+
+#. i18n: file kcmmiscwidget.ui line 277
+#: rc.cpp:197
+#, no-c-format
msgid "%"
msgstr "%"
-#. i18n: file kcmmiscwidget.ui line 266
-#: rc.cpp:194 rc.cpp:200
+#. i18n: file kcmmiscwidget.ui line 280
+#: rc.cpp:200 rc.cpp:206
#, no-c-format
msgid ""
"If supported, this option allows you to hear audible clicks from your "
@@ -1354,8 +1372,8 @@ msgstr ""
"如果支持的话,该选项允许您在击键的时候从计算机的扬声器中听到咔哒击键声。如果您的键盘不是机械式的,或者击键的声音非常小,该特性将非常有用。"
"<p> 您可以拖动滑动条来调整击键反馈的音量,或者按翻转按钮的上下箭头。将音量设置为 0% 则关闭击键音。"
-#. i18n: file kcmmiscwidget.ui line 282
-#: rc.cpp:197
+#. i18n: file kcmmiscwidget.ui line 296
+#: rc.cpp:203
#, no-c-format
msgid "Key click &volume:"
msgstr "击键音量(&V):"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po b/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
index bc611442f8f..2da46b0111b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmlocale\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-17 06:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -73,54 +74,67 @@ msgstr "日期和时间(&T)"
msgid "&Other"
msgstr "其它(&O)"
-#: kcmlocale.cpp:54
+#: kcmlocale.cpp:55
msgid "Country or region:"
msgstr "国家/地区:"
-#: kcmlocale.cpp:60
+#: kcmlocale.cpp:61
msgid "Languages:"
msgstr "语言:"
-#: kcmlocale.cpp:69
+#: kcmlocale.cpp:70
msgid "Add Language"
msgstr "添加语言"
-#: kcmlocale.cpp:73
+#: kcmlocale.cpp:74
msgid "Remove Language"
msgstr "删除语言"
-#: kcmlocale.cpp:74
+#: kcmlocale.cpp:75
msgid "Move Up"
msgstr "上移"
-#: kcmlocale.cpp:75
+#: kcmlocale.cpp:76
msgid "Move Down"
msgstr "下移"
-#: kcmlocale.cpp:235
+#: kcmlocale.cpp:107
+msgid "Install New Language"
+msgstr ""
+
+#: kcmlocale.cpp:109
+#, fuzzy
+msgid "Uninstall Language"
+msgstr "添加语言"
+
+#: kcmlocale.cpp:111
+msgid "Select System Language"
+msgstr ""
+
+#: kcmlocale.cpp:297
msgid "Other"
msgstr "其它"
-#: kcmlocale.cpp:243 kcmlocale.cpp:290 kcmlocale.cpp:311
+#: kcmlocale.cpp:305 kcmlocale.cpp:352 kcmlocale.cpp:373
msgid "without name"
msgstr "没有名称"
-#: kcmlocale.cpp:403
+#: kcmlocale.cpp:465
msgid ""
"This is where you live. TDE will use the defaults for this country or region."
msgstr "这是您居住的地方。TDE 使用该国家/地区的默认设置。"
-#: kcmlocale.cpp:406
+#: kcmlocale.cpp:468
msgid ""
"This will add a language to the list. If the language is already in the list, "
"the old one will be moved instead."
msgstr "这将向列表中添加一种语言。如果该语言已经位于列表中,旧语言将被移动。"
-#: kcmlocale.cpp:410
+#: kcmlocale.cpp:472
msgid "This will remove the highlighted language from the list."
msgstr "这将从列表中删除突出显示的语言。"
-#: kcmlocale.cpp:413
+#: kcmlocale.cpp:475
msgid ""
"TDE programs will be displayed in the first available language in this list.\n"
"If none of the languages are available, US English will be used."
@@ -128,13 +142,13 @@ msgstr ""
"TDE 程序将用该列表中的第一个可用语言显示。\n"
"如果任何语言都不可用,将使用美国英语。"
-#: kcmlocale.cpp:420
+#: kcmlocale.cpp:482
msgid ""
"Here you can choose your country or region. The settings for languages, numbers "
"etc. will automatically switch to the corresponding values."
msgstr "您可以在这里选择您的国家/地区。语言、数字等设置将自动切换到相应的值。"
-#: kcmlocale.cpp:427
+#: kcmlocale.cpp:489
msgid ""
"Here you can choose the languages that will be used by TDE. If the first "
"language in the list is not available, the second will be used, etc. If only US "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
index c7389231d23..148bd5bd46e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmmedia\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:24+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -48,19 +49,19 @@ msgstr "(c) 2005 Jean-Remy Falleri"
msgid "Maintainer"
msgstr "维护者"
-#: main.cpp:70
+#: main.cpp:71
msgid "Help for the application design"
msgstr "应用程序设计帮助"
-#: main.cpp:100
+#: main.cpp:101
msgid "FIXME : Write me..."
msgstr "有待补充"
-#: managermodule.cpp:40
+#: managermodule.cpp:49
msgid "No support for HAL on this system"
msgstr "此系统不支持 HAL"
-#: managermodule.cpp:47
+#: managermodule.cpp:56
msgid "No support for CD polling on this system"
msgstr "此系统不支持 CD 轮询"
@@ -68,54 +69,283 @@ msgstr "此系统不支持 CD 轮询"
msgid "All Mime Types"
msgstr "所有 MIME 类型"
-#. i18n: file managermoduleview.ui line 24
+#. i18n: file managermoduleview.ui line 16
#: rc.cpp:3
#, no-c-format
-msgid "Enable HAL backend"
-msgstr "启用 HAL 后端"
+msgid "ManagerModuleView"
+msgstr ""
#. i18n: file managermoduleview.ui line 27
#: rc.cpp:6
#, no-c-format
+msgid "Enable HAL backend"
+msgstr "启用 HAL 后端"
+
+#. i18n: file managermoduleview.ui line 30
+#: rc.cpp:9
+#, no-c-format
msgid ""
"Select this if you want to enable the Hardware Abstraction Layer "
"(http://hal.freedesktop.org/wiki/Software/hal) support."
msgstr "如果您想要启用硬件抽象层(http://hal.freedesktop.org/wiki/Software/hal)支持,请选中此项。"
-#. i18n: file managermoduleview.ui line 35
-#: rc.cpp:9
+#. i18n: file managermoduleview.ui line 38
+#: rc.cpp:12
#, no-c-format
msgid "Enable CD polling"
msgstr "启用 CD 查询"
-#. i18n: file managermoduleview.ui line 38
-#: rc.cpp:12
+#. i18n: file managermoduleview.ui line 41
+#: rc.cpp:15
#, no-c-format
msgid "Select this to enable the CD polling."
msgstr "选中此项以启用 CD 查询。"
-#. i18n: file managermoduleview.ui line 46
-#: rc.cpp:15
+#. i18n: file managermoduleview.ui line 49
+#: rc.cpp:18
#, no-c-format
msgid "Enable medium application autostart after mount"
msgstr "允许挂载后自动启动介质应用程序"
-#. i18n: file managermoduleview.ui line 49
-#: rc.cpp:18
+#. i18n: file managermoduleview.ui line 52
+#: rc.cpp:21
#, no-c-format
msgid ""
"Select this if you want to enable application autostart after mounting a "
"device."
msgstr "如果您想要在挂载设备后自动启动应用程序,请选中此项。"
+#. i18n: file managermoduleview.ui line 60
+#: rc.cpp:24
+#, no-c-format
+msgid "Mount options"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 80
+#: rc.cpp:27
+#, no-c-format
+msgid ""
+"Here you can specify default mount options for your storage media. Please note "
+"that some options are not supported for certain filesystems and/or medium. You "
+"will be able to redefine all these options on per-volume basis later, using "
+"Properties dialog of the corresponding volume."
+"<br>\n"
+"Some of the options are tristate. Leave them \"undefined\" to let TDE choose "
+"the best value depending on your media."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 99
+#: rc.cpp:31
+#, no-c-format
+msgid "Read only"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 102
+#: rc.cpp:34
+#, no-c-format
+msgid "By default, mount all file systems read-only."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 110
+#: rc.cpp:37
+#, no-c-format
+msgid "Mount as user"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 113
+#: rc.cpp:40
+#, no-c-format
+msgid "Mount this file system as user."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 121
+#: rc.cpp:43
+#, no-c-format
+msgid "Flushed IO"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 127
+#: rc.cpp:46
+#, no-c-format
+msgid ""
+"Always flush all data to the hot plug devices immediately and don't cache it."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 135
+#: rc.cpp:49
+#, no-c-format
+msgid "Synchronous"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 141
+#: rc.cpp:52
+#, no-c-format
+msgid "All I/O to the file system should be done synchronously."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 149
+#: rc.cpp:55
+#, no-c-format
+msgid "Quiet"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 152
+#: rc.cpp:58
+#, no-c-format
+msgid ""
+"Attempts to chown or chmod files do not return errors, although they fail. Use "
+"with caution!"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 160
+#: rc.cpp:61
+#, no-c-format
+msgid "UTF-8 charset"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 163
+#: rc.cpp:64
+#, no-c-format
+msgid ""
+"UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
+"console. It can be be enabled for the filesystem with this option."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 179
+#: rc.cpp:67
+#, no-c-format
+msgid "Short names:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 197
+#: rc.cpp:70
+#, no-c-format
+msgid ""
+"<h2>Defines the behaviour for creation and display of filenames which fit "
+"into 8.3 characters. If a long name for a file exists, it will always be "
+"preferred display.</h2>\n"
+"\n"
+"<h3><b>Lower</b></h3>\n"
+"Force the short name to lower case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows 95</b></h3>\n"
+"Force the short name to upper case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows NT</b></h3>\n"
+"Display the shortname as is; store a long name when the short name is not all "
+"lower case or all upper case.\n"
+"\n"
+"<h3><b>Mixed</b></h3>\n"
+"Display the short name as is; store a long name when the short name is not all "
+"upper case."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 203
+#: rc.cpp:85
+#, no-c-format
+msgid "All Data"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 208
+#: rc.cpp:88
+#, no-c-format
+msgid "Ordered"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 213
+#: rc.cpp:91
+#, no-c-format
+msgid "Writeback"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 228
+#: rc.cpp:94
+#, no-c-format
+msgid "Journaling:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 243
+#: rc.cpp:97
+#, no-c-format
+msgid ""
+"<h2>Specifies the journalling mode for file data. Metadata is always "
+"journaled. </h2>\n"
+" \n"
+"<h3><b>All Data</b></h3>\n"
+" All data is committed into the journal prior to being written "
+"into the main file system. This is the slowest variant with the highest data "
+"security.\n"
+"\n"
+"<h3><b>Ordered</b></h3>\n"
+" All data is forced directly out to the main file system prior to "
+"its metadata being committed to the journal.\n"
+"\n"
+"<h3><b>Write Back</b></h3>\n"
+" Data ordering is not preserved - data may be written into the main "
+"file system after its metadata has been committed to the journal. This is "
+"rumoured to be the highest-throughput option. It guarantees internal file "
+"system integrity, however it can allow old data to appear in files after a "
+"crash and journal recovery."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 249
+#: rc.cpp:109
+#, no-c-format
+msgid "Lower"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 254
+#: rc.cpp:112
+#, no-c-format
+msgid "Windows 95"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 259
+#: rc.cpp:115
+#, no-c-format
+msgid "Windows NT"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 264
+#: rc.cpp:118
+#, no-c-format
+msgid "Mixed"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 278
+#: rc.cpp:121
+#, no-c-format
+msgid "Mount automatically"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 281
+#: rc.cpp:124
+#, no-c-format
+msgid "By default, mount all file systems automatically."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 289
+#: rc.cpp:127
+#, no-c-format
+msgid "Access time updates"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 295
+#: rc.cpp:130
+#, no-c-format
+msgid "Update inode access time for each access."
+msgstr ""
+
#. i18n: file notifiermoduleview.ui line 48
-#: rc.cpp:21
+#: rc.cpp:133
#, no-c-format
msgid "Medium types:"
msgstr "介质类型:"
#. i18n: file notifiermoduleview.ui line 64
-#: rc.cpp:24
+#: rc.cpp:136
#, no-c-format
msgid ""
"Here is the list of the available types of medium which can be monitored. You "
@@ -124,43 +354,43 @@ msgid ""
msgstr "此处列出了可监视的全部介质类型。选择介质类型可以对可用的动作进行过滤。如果您想要查看全部动作,请选择“全部 MIME 类型”。"
#. i18n: file notifiermoduleview.ui line 90
-#: rc.cpp:27
+#: rc.cpp:139
#, no-c-format
msgid "&Add..."
msgstr "添加(&A)..."
#. i18n: file notifiermoduleview.ui line 93
-#: rc.cpp:30
+#: rc.cpp:142
#, no-c-format
msgid "Click here to add an action."
msgstr "单击此处可添加动作。"
#. i18n: file notifiermoduleview.ui line 104
-#: rc.cpp:36
+#: rc.cpp:148
#, no-c-format
msgid "Click here to delete the selected action if possible."
msgstr "单击此处可删除选中的动作。"
#. i18n: file notifiermoduleview.ui line 112
-#: rc.cpp:39
+#: rc.cpp:151
#, no-c-format
msgid "&Edit..."
msgstr "编辑(&E)..."
#. i18n: file notifiermoduleview.ui line 115
-#: rc.cpp:42
+#: rc.cpp:154
#, no-c-format
msgid "Click here to edit the selected action if possible."
msgstr "单击此处可编辑选中的动作。"
#. i18n: file notifiermoduleview.ui line 123
-#: rc.cpp:45
+#: rc.cpp:157
#, no-c-format
msgid "&Toggle as Auto Action"
msgstr "切换为自动动作(&T)"
#. i18n: file notifiermoduleview.ui line 126
-#: rc.cpp:48
+#: rc.cpp:160
#, no-c-format
msgid ""
"Click here to perform this action automatically on detection of the selected "
@@ -168,7 +398,7 @@ msgid ""
msgstr "单击此处表明在检测到选中的介质类型后自动执行此动作(如果所选的是“全部 MIME 类型”,则此选项被禁用)。"
#. i18n: file notifiermoduleview.ui line 153
-#: rc.cpp:51
+#: rc.cpp:163
#, no-c-format
msgid ""
"Here is the list of the available actions. You can modify them by using the "
@@ -176,25 +406,25 @@ msgid ""
msgstr "此处列出了可用的动作。您可以使用右侧的按钮修改。"
#. i18n: file serviceview.ui line 30
-#: rc.cpp:54 rc.cpp:57 serviceconfigdialog.cpp:40
+#: rc.cpp:166 rc.cpp:169 serviceconfigdialog.cpp:40
#, no-c-format
msgid "Edit Service"
msgstr "编辑服务"
#. i18n: file serviceview.ui line 188
-#: rc.cpp:60
+#: rc.cpp:172
#, no-c-format
msgid "Available &medium types:"
msgstr "可用的介质服务(&M):"
#. i18n: file serviceview.ui line 191
-#: rc.cpp:63
+#: rc.cpp:175
#, no-c-format
msgid "Displa&y service for:"
msgstr "显示服务的介质(&Y):"
#. i18n: file serviceview.ui line 218
-#: rc.cpp:66
+#: rc.cpp:178
#, no-c-format
msgid "Command:"
msgstr "命令:"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmnic.po b/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
index fa06f54a523..5f356530282 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmnic\n"
-"POT-Creation-Date: 2006-12-31 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-09 23:33+0800\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po b/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
index f5d1df7b63f..8870d1f94e7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmnotify\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:39+0800\n"
"Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +27,9 @@ msgid ""
msgstr "zxd@bu.edu"
#: knotify.cpp:56
+#, fuzzy
msgid ""
-"<h1>System Notifications</h1>TDE allows for a great deal of control over how "
+"<h1>System Notifications</h1>KDE allows for a great deal of control over how "
"you will be notified when certain events occur. There are several choices as to "
"how you are notified:"
"<ul>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po b/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
index 8abb20d2e9a..a89631b3e5a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmperformance\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-02 03:09+0800\n"
"Last-Translator: asteroid <asteroid@Planetio>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -168,17 +169,18 @@ msgid ""
msgstr "<b>警告:</b>此选项可能在极少数情况下导致各种问题。详情请查看“这是什么”帮助(Shift+F1)。"
#: system.cpp:34
+#, fuzzy
msgid ""
"<p>During startup TDE needs to perform a check of its system configuration "
"(mimetypes, installed applications, etc.), and in case the configuration has "
-"changed since the last time, the system configuration cache (KSyCoCa) needs to "
-"be updated.</p>"
+"changed since the last time, the system configuration cache (TDESyCoCa) needs "
+"to be updated.</p>"
"<p>This option delays the check, which avoid scanning all directories "
"containing files describing the system during TDE startup, thus making TDE "
"startup faster. However, in the rare case the system configuration has changed "
"since the last time, and the change is needed before this delayed check takes "
-"place, this option may lead to various problems (missing applications in the K "
-"Menu, reports from applications about missing required mimetypes, etc.).</p>"
+"place, this option may lead to various problems (missing applications in the "
+"TDE Menu, reports from applications about missing required mimetypes, etc.).</p>"
"<p>Changes of system configuration mostly happen by (un)installing "
"applications. It is therefore recommended to turn this option temporarily off "
"while (un)installing applications.</p>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po b/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
index 51dbffc9cbc..70b935558e7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmprintmgr\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:34+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po b/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
index a3fa520c04c..ffc6a849fe8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmsamba\n"
-"POT-Creation-Date: 2005-07-06 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-09 23:39+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +61,8 @@ msgid "TDE Panel System Information Control Module"
msgstr "TDE 面板系统信息控制模块"
#: main.cpp:88
-msgid "(c) 2002 TDE Information Control Module Samba Team"
+#, fuzzy
+msgid "(c) 2002 KDE Information Control Module Samba Team"
msgstr "(C) 2002 TDE 信息控制模块 Samba 团队"
#: kcmsambaimports.cpp:46 ksmbstatus.cpp:63
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
index ce6b8c4b024..097e4ac2b35 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmscreensaver\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-14 04:54+0800\n"
"Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -194,7 +195,7 @@ msgstr "左下角:"
msgid "Bottom right:"
msgstr "右下角:"
-#: scrnsave.cpp:89
+#: scrnsave.cpp:104
msgid ""
"<h1>Screen Saver</h1> This module allows you to enable and configure a screen "
"saver. Note that you can enable a screen saver even if you have power saving "
@@ -210,95 +211,139 @@ msgstr ""
"<p>除了提供丰富多采的娱乐和防止显示器损伤外,屏幕保护程序同时提供了一个简便的方法,在您离开显示器时锁定它。如果您希望屏幕保护程序锁定屏幕,请确认您启用了屏幕"
"保护程序的“需要密码”功能。如果您没有启用,仍然可以用桌面的“锁定会话”动作来锁定屏幕。"
-#: scrnsave.cpp:132
+#: scrnsave.cpp:147
msgid "Screen Saver"
msgstr "屏幕保护程序"
-#: scrnsave.cpp:147
+#: scrnsave.cpp:162
msgid "Select the screen saver to use."
msgstr "选择要使用的屏幕保护程序。"
-#: scrnsave.cpp:150
+#: scrnsave.cpp:165
msgid "&Setup..."
msgstr "设置(&S)..."
-#: scrnsave.cpp:154
+#: scrnsave.cpp:169
msgid "Configure the screen saver's options, if any."
msgstr "如果有的话,配置屏幕保护程序的选项。"
-#: scrnsave.cpp:156
+#: scrnsave.cpp:171
msgid "&Test"
msgstr "测试(&T)"
-#: scrnsave.cpp:160
+#: scrnsave.cpp:175
msgid "Show a full screen preview of the screen saver."
msgstr "显示屏幕保护程序的全屏预览。"
-#: scrnsave.cpp:162
+#: scrnsave.cpp:177
msgid "Settings"
msgstr "设置"
-#: scrnsave.cpp:169
+#: scrnsave.cpp:182
msgid "Start a&utomatically"
msgstr "自动启动(&U)"
-#: scrnsave.cpp:172
+#: scrnsave.cpp:184
msgid "Automatically start the screen saver after a period of inactivity."
msgstr "在指定时间不活动之后,自动启动屏幕保护程序。"
-#: scrnsave.cpp:180 scrnsave.cpp:213
+#: scrnsave.cpp:191 scrnsave.cpp:219
msgid "After:"
msgstr "等待:"
-#: scrnsave.cpp:186
+#: scrnsave.cpp:197
msgid " min"
msgstr " 分钟"
-#: scrnsave.cpp:195
+#: scrnsave.cpp:205
msgid "The period of inactivity after which the screen saver should start."
msgstr "启动屏幕保护程序之前要等待的不活动时长。"
-#: scrnsave.cpp:201
+#: scrnsave.cpp:209
msgid "&Require password to stop"
msgstr "需要密码来停止(&R)"
-#: scrnsave.cpp:208
+#: scrnsave.cpp:214
msgid ""
"Prevent potential unauthorized use by requiring a password to stop the screen "
"saver."
msgstr "要停止屏幕保护程序,需要提供密码,这可以避免未授权的使用。"
-#: scrnsave.cpp:216
+#: scrnsave.cpp:221
msgid ""
"The amount of time, after the screen saver has started, to ask for the unlock "
"password."
msgstr "屏幕保护程序启动后,请求解锁密码的时长。"
-#: scrnsave.cpp:221
+#: scrnsave.cpp:226
msgid " sec"
msgstr " 秒"
-#: scrnsave.cpp:239
+#: scrnsave.cpp:242
msgid "Choose the period after which the display will be locked. "
msgstr "选择显示被锁定前等待的时间。"
+#: scrnsave.cpp:246
+msgid "&Delay saver start after lock"
+msgstr ""
+
+#: scrnsave.cpp:251
+msgid ""
+"When manually locking the screen, wait to start the screen saver until the "
+"configured start delay has elapsed."
+msgstr ""
+
#: scrnsave.cpp:253
+msgid "&Use Secure Attention Key"
+msgstr ""
+
+#: scrnsave.cpp:258
+msgid "Require Secure Attention Key prior to displaying the unlock dialog."
+msgstr ""
+
+#: scrnsave.cpp:260
+msgid "Use &legacy lock windows"
+msgstr ""
+
+#: scrnsave.cpp:265
+msgid "Use old-style unmanaged X11 lock windows."
+msgstr ""
+
+#: scrnsave.cpp:267
+msgid "Hide active &windows from saver"
+msgstr ""
+
+#: scrnsave.cpp:272
+msgid ""
+"Hide all active windows from the screen saver and use the desktop background as "
+"the screen saver input."
+msgstr ""
+
+#: scrnsave.cpp:274
+msgid "Hide &cancel button"
+msgstr ""
+
+#: scrnsave.cpp:279
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#: scrnsave.cpp:288
msgid "A preview of the selected screen saver."
msgstr "选中屏幕保护程序的预览。"
-#: scrnsave.cpp:258
+#: scrnsave.cpp:293
msgid "Advanced &Options"
msgstr "高级选项(&O)"
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
msgid "kcmscreensaver"
msgstr "kcmscreensaver"
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
msgid "TDE Screen Saver Control Module"
msgstr "TDE 屏幕保护控制模块"
-#: scrnsave.cpp:287
+#: scrnsave.cpp:322
msgid ""
"(c) 1997-2002 Martin R. Jones\n"
"(c) 2003-2004 Chris Howells"
@@ -306,7 +351,7 @@ msgstr ""
"(c) 1997-2002 Martin R. Jones\n"
"(c) 2003-2004 Chris Howells"
-#: scrnsave.cpp:470
+#: scrnsave.cpp:519
msgid "Loading..."
msgstr "正在装入..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po b/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
index ec44f84d4ed..75335fd697d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmsmartcard\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:30+0800\n"
"Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -44,8 +45,8 @@ msgstr "可能的原因"
msgid ""
"\n"
"1) The TDE daemon, 'kded' is not running. You can restart it by running the "
-"command 'tdeinit' and then try reloading the Trinity Control Center to see if this "
-"message goes away.\n"
+"command 'tdeinit' and then try reloading the Trinity Control Center to see if "
+"this message goes away.\n"
"\n"
"2) You don't appear to have smartcard support in the TDE libraries. You will "
"need to recompile the tdelibs package with libpcsclite installed."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
index 9a341aec65b..ef8ebb2d355 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmsmserer\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:34+0800\n"
"Last-Translator: Wang Hui <wanghuilux@yeah.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -51,20 +52,69 @@ msgid ""
"confirmation dialog box."
msgstr "如果您想会话管理器显示注销确认窗口,请选用此选项。"
-#. i18n: file smserverconfigdlg.ui line 62
+#. i18n: file smserverconfigdlg.ui line 65
#: rc.cpp:15
#, no-c-format
+msgid "Show &logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 68
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口,请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 79
+#: rc.cpp:21
+#, no-c-format
+msgid "Sho&w fancy logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 82
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fancy fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口,请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 90
+#: rc.cpp:27
+#, no-c-format
msgid "O&ffer shutdown options"
msgstr "提供关机选项(&F)"
-#. i18n: file smserverconfigdlg.ui line 72
-#: rc.cpp:18
+#. i18n: file smserverconfigdlg.ui line 93
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see various options when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口,请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 101
+#: rc.cpp:33
+#, no-c-format
+msgid "Show logout stat&us dialog"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 104
+#: rc.cpp:36
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a dialog box showing the logout status."
+msgstr "如果您想会话管理器显示注销确认窗口,请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 114
+#: rc.cpp:39
#, no-c-format
msgid "On Login"
msgstr "登录时"
-#. i18n: file smserverconfigdlg.ui line 79
-#: rc.cpp:21
+#. i18n: file smserverconfigdlg.ui line 121
+#: rc.cpp:42
#, no-c-format
msgid ""
"<ul>\n"
@@ -83,70 +133,70 @@ msgstr ""
"<li><b>启动空会话:</b>什么也不保存。下次启动时将会出现空桌面。</li>\n"
"</ul>"
-#. i18n: file smserverconfigdlg.ui line 90
-#: rc.cpp:28
+#. i18n: file smserverconfigdlg.ui line 132
+#: rc.cpp:49
#, no-c-format
msgid "Restore &previous session"
msgstr "恢复上一次会话(&P)"
-#. i18n: file smserverconfigdlg.ui line 98
-#: rc.cpp:31
+#. i18n: file smserverconfigdlg.ui line 140
+#: rc.cpp:52
#, no-c-format
msgid "Restore &manually saved session"
msgstr "恢复手动保存的会话(&M)"
-#. i18n: file smserverconfigdlg.ui line 106
-#: rc.cpp:34
+#. i18n: file smserverconfigdlg.ui line 148
+#: rc.cpp:55
#, no-c-format
msgid "Start with an empty &session"
msgstr "以空会话启动(&S)"
-#. i18n: file smserverconfigdlg.ui line 116
-#: rc.cpp:37
+#. i18n: file smserverconfigdlg.ui line 158
+#: rc.cpp:58
#, no-c-format
msgid "Default Shutdown Option"
msgstr "默认关机选项"
-#. i18n: file smserverconfigdlg.ui line 119
-#: rc.cpp:40
+#. i18n: file smserverconfigdlg.ui line 161
+#: rc.cpp:61
#, no-c-format
msgid ""
"Here you can choose what should happen by default when you log out. This only "
"has meaning, if you logged in through TDM."
msgstr "在此你可以选择退出时的默认行为。这仅在通过TDM退出时有意义。"
-#. i18n: file smserverconfigdlg.ui line 130
-#: rc.cpp:43
+#. i18n: file smserverconfigdlg.ui line 172
+#: rc.cpp:64
#, no-c-format
msgid "&End current session"
msgstr "结束当前会话(&E)"
-#. i18n: file smserverconfigdlg.ui line 138
-#: rc.cpp:46
+#. i18n: file smserverconfigdlg.ui line 180
+#: rc.cpp:67
#, no-c-format
msgid "&Turn off computer"
msgstr "关闭计算机(&T)"
-#. i18n: file smserverconfigdlg.ui line 146
-#: rc.cpp:49
+#. i18n: file smserverconfigdlg.ui line 188
+#: rc.cpp:70
#, no-c-format
msgid "&Restart computer"
msgstr "重启计算机(&R)"
-#. i18n: file smserverconfigdlg.ui line 156
-#: rc.cpp:52
+#. i18n: file smserverconfigdlg.ui line 198
+#: rc.cpp:73
#, no-c-format
msgid "Advanced"
msgstr "高级"
-#. i18n: file smserverconfigdlg.ui line 167
-#: rc.cpp:55
+#. i18n: file smserverconfigdlg.ui line 209
+#: rc.cpp:76
#, no-c-format
msgid "Applications to be e&xcluded from sessions:"
msgstr "要从会话中排除的应用程序(&X):"
-#. i18n: file smserverconfigdlg.ui line 178
-#: rc.cpp:58
+#. i18n: file smserverconfigdlg.ui line 220
+#: rc.cpp:79
#, no-c-format
msgid ""
"Here you can enter a comma-separated list of applications that should not be "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po b/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
index f6c7f7fa114..e087c83db1f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmspellchecking\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-07-28 09:40+0800\n"
"Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po b/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
index bca6d6ccaf6..d6ccbd59040 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmstyle\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:32+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -57,145 +58,177 @@ msgid "Sho&w icons on buttons"
msgstr "在按钮上显示图标(&W)"
#: kcmstyle.cpp:184
+msgid "Enable &scrolling in popup menus"
+msgstr ""
+
+#: kcmstyle.cpp:186
+msgid "Hide &underlined characters in the menu bar when not in use"
+msgstr ""
+
+#: kcmstyle.cpp:188
+msgid "&Pressing only the menu bar activator key selects the menu bar"
+msgstr ""
+
+#: kcmstyle.cpp:190
msgid "E&nable tooltips"
msgstr "启用工具提示(&N)"
-#: kcmstyle.cpp:186
+#: kcmstyle.cpp:192
msgid "Show tear-off handles in &popup menus"
msgstr "在弹出菜单中显示漂移句柄(&P)"
-#: kcmstyle.cpp:190
+#: kcmstyle.cpp:199
+#, fuzzy
+msgid "Menu popup delay:"
+msgstr "菜单不透明度(&O):"
+
+#: kcmstyle.cpp:201
+msgid " msec"
+msgstr ""
+
+#: kcmstyle.cpp:207
msgid "Preview"
msgstr "预览"
-#: kcmstyle.cpp:208
+#: kcmstyle.cpp:225
msgid "&Enable GUI effects"
msgstr "启用 GUI 特效(&E)"
-#: kcmstyle.cpp:216 kcmstyle.cpp:224 kcmstyle.cpp:233 kcmstyle.cpp:243
+#: kcmstyle.cpp:233 kcmstyle.cpp:241 kcmstyle.cpp:250 kcmstyle.cpp:258
+#: kcmstyle.cpp:268
msgid "Disable"
msgstr "禁用"
-#: kcmstyle.cpp:217 kcmstyle.cpp:225 kcmstyle.cpp:234
+#: kcmstyle.cpp:234 kcmstyle.cpp:242 kcmstyle.cpp:259
msgid "Animate"
msgstr "动画"
-#: kcmstyle.cpp:218
+#: kcmstyle.cpp:235
msgid "Combobo&x effect:"
msgstr "组合框特效(&X):"
-#: kcmstyle.cpp:226 kcmstyle.cpp:235
+#: kcmstyle.cpp:243 kcmstyle.cpp:260
msgid "Fade"
msgstr "淡入淡出"
-#: kcmstyle.cpp:227
+#: kcmstyle.cpp:244
msgid "&Tool tip effect:"
msgstr "工具提示特效(&T):"
-#: kcmstyle.cpp:236
+#: kcmstyle.cpp:251
+#, fuzzy
+msgid "Make translucent"
+msgstr "半透明"
+
+#: kcmstyle.cpp:252
+#, fuzzy
+msgid "&Rubberband effect:"
+msgstr "菜单效果(&M):"
+
+#: kcmstyle.cpp:261
msgid "Make Translucent"
msgstr "半透明"
-#: kcmstyle.cpp:237
+#: kcmstyle.cpp:262
msgid "&Menu effect:"
msgstr "菜单效果(&M):"
-#: kcmstyle.cpp:244
+#: kcmstyle.cpp:269
msgid "Application Level"
msgstr "应用程序级别"
-#: kcmstyle.cpp:246
+#: kcmstyle.cpp:271
msgid "Me&nu tear-off handles:"
msgstr "菜单脱离柄(&N):"
-#: kcmstyle.cpp:251
+#: kcmstyle.cpp:276
msgid "Menu &drop shadow"
msgstr "菜单阴影(&D)"
-#: kcmstyle.cpp:272
+#: kcmstyle.cpp:297
msgid "Software Tint"
msgstr "软件着色"
-#: kcmstyle.cpp:273
+#: kcmstyle.cpp:298
msgid "Software Blend"
msgstr "软件混色"
-#: kcmstyle.cpp:275
+#: kcmstyle.cpp:300
msgid "XRender Blend"
msgstr "XRender 混色"
-#: kcmstyle.cpp:288
+#: kcmstyle.cpp:313
#, c-format
msgid "0%"
msgstr "0%"
-#: kcmstyle.cpp:290
+#: kcmstyle.cpp:315
#, c-format
msgid "50%"
msgstr "50%"
-#: kcmstyle.cpp:292
+#: kcmstyle.cpp:317
#, c-format
msgid "100%"
msgstr "100%"
-#: kcmstyle.cpp:295
+#: kcmstyle.cpp:320
msgid "Menu trans&lucency type:"
msgstr "菜单半透明类型(&L):"
-#: kcmstyle.cpp:297
+#: kcmstyle.cpp:322
msgid "Menu &opacity:"
msgstr "菜单不透明度(&O):"
-#: kcmstyle.cpp:326
+#: kcmstyle.cpp:351
msgid "High&light buttons under mouse"
msgstr "突出显示鼠标下的按钮(&L)"
-#: kcmstyle.cpp:327
+#: kcmstyle.cpp:352
msgid "Transparent tool&bars when moving"
msgstr "移动时工具栏是透明的(&B)"
-#: kcmstyle.cpp:332
+#: kcmstyle.cpp:357
msgid "Text pos&ition:"
msgstr "文字位置(&I):"
-#: kcmstyle.cpp:334
+#: kcmstyle.cpp:359
msgid "Icons Only"
msgstr "只有图标"
-#: kcmstyle.cpp:335
+#: kcmstyle.cpp:360
msgid "Text Only"
msgstr "只有文字"
-#: kcmstyle.cpp:336
+#: kcmstyle.cpp:361
msgid "Text Alongside Icons"
msgstr "文字在图标旁"
-#: kcmstyle.cpp:337
+#: kcmstyle.cpp:362
msgid "Text Under Icons"
msgstr "文字在图标下"
-#: kcmstyle.cpp:379
+#: kcmstyle.cpp:409
msgid "&Style"
msgstr "样式(&S)"
-#: kcmstyle.cpp:380
+#: kcmstyle.cpp:410
msgid "&Effects"
msgstr "特效(&E)"
-#: kcmstyle.cpp:381
+#: kcmstyle.cpp:411
msgid "&Toolbar"
msgstr "工具栏(&T)"
-#: kcmstyle.cpp:418 kcmstyle.cpp:429
+#: kcmstyle.cpp:448 kcmstyle.cpp:459
msgid "There was an error loading the configuration dialog for this style."
msgstr "装入此样式的配置对话框出错。"
-#: kcmstyle.cpp:420 kcmstyle.cpp:431
+#: kcmstyle.cpp:450 kcmstyle.cpp:461
msgid "Unable to Load Dialog"
msgstr "无法装入对话框"
-#: kcmstyle.cpp:520
+#: kcmstyle.cpp:550
msgid ""
"<qt>Selected style: <b>%1</b>"
"<br>"
@@ -210,49 +243,49 @@ msgstr ""
"<br>"
"<br>"
-#: kcmstyle.cpp:532
+#: kcmstyle.cpp:562
msgid "Menu translucency is not available.<br>"
msgstr "菜单半透明不可用。<br>"
-#: kcmstyle.cpp:539
+#: kcmstyle.cpp:569
msgid "Menu drop-shadows are not available."
msgstr "菜单阴影不可用。"
-#: kcmstyle.cpp:722 kcmstyle.cpp:834
+#: kcmstyle.cpp:764 kcmstyle.cpp:876
msgid "No description available."
msgstr "没有描述。"
-#: kcmstyle.cpp:834
+#: kcmstyle.cpp:876
#, c-format
msgid "Description: %1"
msgstr "描述:%1"
-#: kcmstyle.cpp:1013
+#: kcmstyle.cpp:1065
msgid ""
"Here you can choose from a list of predefined widget styles (e.g. the way "
"buttons are drawn) which may or may not be combined with a theme (additional "
"information like a marble texture or a gradient)."
msgstr "您可以从预定义部件样式(如按钮的绘制方式)列表中选择哪些可以(或不可以)与主题组合(如大理石贴图或颜色梯度等附加信息)。"
-#: kcmstyle.cpp:1017
+#: kcmstyle.cpp:1069
msgid ""
"This area shows a preview of the currently selected style without having to "
"apply it to the whole desktop."
msgstr "此区域所显示的预览能够使得您无需将所选样式应用到整个桌面即可观看该样式的效果。"
-#: kcmstyle.cpp:1021
+#: kcmstyle.cpp:1073
msgid ""
"This page allows you to enable various widget style effects. For best "
"performance, it is advisable to disable all effects."
msgstr "此页面允许您启用各种部件样式效果。要获得最佳的执行效率,推荐禁用全部特效。"
-#: kcmstyle.cpp:1023
+#: kcmstyle.cpp:1075
msgid ""
"If you check this box, you can select several effects for different widgets "
"like combo boxes, menus or tooltips."
msgstr "如果您选中此选项,您就可以为不同的部件如组合框、菜单或工具提示选择几种特效。"
-#: kcmstyle.cpp:1025
+#: kcmstyle.cpp:1077
msgid ""
"<p><b>Disable: </b>do not use any combo box effects.</p>\n"
"<b>Animate: </b>Do some animation."
@@ -260,7 +293,7 @@ msgstr ""
"<p><b>禁用:</b>不使用任何组合框特效。</p>\n"
"<b>动画:</b>显示动画。"
-#: kcmstyle.cpp:1027
+#: kcmstyle.cpp:1079
msgid ""
"<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
@@ -270,7 +303,16 @@ msgstr ""
"<p><b>动画:</b>显示动画。</p>\n"
"<b>淡入淡出:</b>使用 Alpha 混合造成工具提示淡入淡出的效果。"
-#: kcmstyle.cpp:1030
+#: kcmstyle.cpp:1082
+#, fuzzy
+msgid ""
+"<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
+"<b>Make Translucent: </b>Draw a translucent rubberband."
+msgstr ""
+"<p><b>禁用:</b>不使用任何组合框特效。</p>\n"
+"<b>动画:</b>显示动画。"
+
+#: kcmstyle.cpp:1084
msgid ""
"<p><b>Disable: </b>do not use any menu effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
@@ -283,14 +325,14 @@ msgstr ""
"<p><b>淡入淡出:</b>使用 Alpha 混色造成菜单淡入淡出的效果。</p>\n"
"<b>半透明:</b>Alpha 混色菜单的透视效果。(仅 TDE 样式)"
-#: kcmstyle.cpp:1034
+#: kcmstyle.cpp:1088
msgid ""
"When enabled, all popup menus will have a drop-shadow, otherwise drop-shadows "
"will not be displayed. At present, only TDE styles can have this effect "
"enabled."
msgstr "如果启用的话,所有的弹出菜单都会显示阴影,否则不会显示阴影。目前只有 TDE 样式可以启用此特效。"
-#: kcmstyle.cpp:1037
+#: kcmstyle.cpp:1091
msgid ""
"<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
"<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n"
@@ -304,35 +346,35 @@ msgstr ""
"<b>XRender 混色:</b>使用 XFree RENDER "
"扩展进行图像混色(若可用的话)。与无加速显示设备上的软件例程相比,这种方式会较慢,但是在远程显示时的性能会较高。</p>\n"
-#: kcmstyle.cpp:1042
+#: kcmstyle.cpp:1096
msgid "By adjusting this slider you can control the menu effect opacity."
msgstr "通过调整此滑块,您可以控制菜单特效的不透明度。"
-#: kcmstyle.cpp:1045
+#: kcmstyle.cpp:1099
msgid ""
"<b>Note:</b> that all widgets in this combobox do not apply to Qt-only "
"applications."
msgstr "<b>注意:</b>此组合框中的所有部件都不会应用到只用 Qt 的应用程序中!"
-#: kcmstyle.cpp:1047
+#: kcmstyle.cpp:1101
msgid ""
"If this option is selected, toolbar buttons will change their color when the "
"mouse cursor is moved over them."
msgstr "如果使用此选项,在鼠标移动到工具栏按钮上时,它们将改变颜色。"
-#: kcmstyle.cpp:1049
+#: kcmstyle.cpp:1103
msgid ""
"If you check this box, the toolbars will be transparent when moving them "
"around."
msgstr "如果您选中此选项,工具提示将会在被鼠标四处移动的时候变成透明。"
-#: kcmstyle.cpp:1051
+#: kcmstyle.cpp:1105
msgid ""
"If you check this option, the TDE application will offer tooltips when the "
"cursor remains over items in the toolbar."
msgstr "如果您选中此选项,TDE 应用程序将会在鼠标指针指向工具栏中的项目时提供工具提示。"
-#: kcmstyle.cpp:1053
+#: kcmstyle.cpp:1107
msgid ""
"<p><b>Icons only:</b> Shows only icons on toolbar buttons. Best option for low "
"resolutions.</p>"
@@ -346,13 +388,46 @@ msgstr ""
"<p><b>文字在图标旁:</b>在工具栏按钮上同时显示图标和文字。文字排列于图标旁边。</p>"
"<p><b>文字在图标下:</b>在工具栏按钮上同时显示图标和文字。文本排列于图标下。"
-#: kcmstyle.cpp:1060
+#: kcmstyle.cpp:1114
msgid ""
"If you enable this option, TDE Applications will show small icons alongside "
"some important buttons."
msgstr "如果您启用此选项,TDE 应用程序将会在某些重要按钮旁边显示小图标。"
-#: kcmstyle.cpp:1062
+#: kcmstyle.cpp:1116
+#, fuzzy
+msgid ""
+"If you enable this option, pop-up menus will scroll if vertical space is "
+"exhausted."
+msgstr "如果您启用此选项,TDE 应用程序将会在某些重要按钮旁边显示小图标。"
+
+#: kcmstyle.cpp:1117
+msgid ""
+"Program drop-down menus can be used with either the mouse or keyboard. Each "
+"menu item on the menu bar that can be activated from the keyboard contains one "
+"character that is underlined. When the underlined character key is pressed "
+"concurrently with the activator key (usually Alt), the keyboard combination "
+"opens the menu or selects that menu item. The underlines can remain hidden "
+"until the activator key is pressed or remain visible at all times. Enabling "
+"this option hides the underlines until pressing the activator key. Note: some "
+"widget styles do not support this feature."
+msgstr ""
+
+#: kcmstyle.cpp:1124
+msgid ""
+"When using the keyboard, program drop-down menus can be activated in one of two "
+"ways. Concurrently press the activator key (usually Alt) and the underlined "
+"character that is part of the menu name, or sequentially press and release the "
+"activator key and then press the underlined character. Enabling this option "
+"selects the latter method. The method of concurrently pressing both keys is "
+"supported in both Trinity and non Trinity programs. The choice of using either "
+"method applies to Trinity Programs only and not to non Trinity programs. "
+"Regardless of which option is preferred, after a desired menu opens, pressing "
+"only the respective underlined key of any menu item is required to select that "
+"menu item."
+msgstr ""
+
+#: kcmstyle.cpp:1132
msgid ""
"If you enable this option some pop-up menus will show so called tear-off "
"handles. If you click them, you get the menu inside a widget. This can be very "
@@ -360,6 +435,12 @@ msgid ""
msgstr ""
"如果您启用此选项,某些弹出菜单将会显示被称为漂移句柄的部件。如果您单击这些漂移句柄,菜单就会漂移为新的部件窗口。在执行多次相同操作时,此功能非常有用。"
+#: kcmstyle.cpp:1136
+msgid ""
+"The menu popup delay is the time (in milliseconds) before a selected menu or "
+"submenu appears."
+msgstr ""
+
#: menupreview.cpp:160
#, c-format
msgid "%"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
index d483940ed50..2a601f59028 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmtaskbar\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-20 01:48+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,67 +31,92 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
msgid "Show Task List"
msgstr "显示任务列表"
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
msgid "Show Operations Menu"
msgstr "显示操作菜单"
-#: kcmtaskbar.cpp:84
+#: kcmtaskbar.cpp:104
msgid "Activate, Raise or Minimize Task"
msgstr "激活、提升或最小化任务"
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
msgid "Activate Task"
msgstr "激活任务"
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
msgid "Raise Task"
msgstr "提升任务"
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
msgid "Lower Task"
msgstr "降低任务"
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
msgid "Minimize Task"
msgstr "最小化任务"
-#: kcmtaskbar.cpp:87
-msgid "To Current Desktop"
+#: kcmtaskbar.cpp:107
+#, fuzzy
+msgid "Move To Current Desktop"
msgstr "到当前桌面"
-#: kcmtaskbar.cpp:88
+#: kcmtaskbar.cpp:108
msgid "Close Task"
msgstr "关闭任务"
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
msgid "Never"
msgstr "从不"
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
msgid "When Taskbar Full"
msgstr "任务栏满时"
-#: kcmtaskbar.cpp:107
+#: kcmtaskbar.cpp:127
msgid "Always"
msgstr "总是"
-#: kcmtaskbar.cpp:129
+#: kcmtaskbar.cpp:145
+msgid "Any"
+msgstr ""
+
+#: kcmtaskbar.cpp:145
+msgid "Only Stopped"
+msgstr ""
+
+#: kcmtaskbar.cpp:146
+msgid "Only Running"
+msgstr ""
+
+#: kcmtaskbar.cpp:164
+msgid "Icons and Text"
+msgstr ""
+
+#: kcmtaskbar.cpp:165
+msgid "Text only"
+msgstr ""
+
+#: kcmtaskbar.cpp:166
+msgid "Icons only"
+msgstr ""
+
+#: kcmtaskbar.cpp:217
msgid "Elegant"
msgstr "智能"
-#: kcmtaskbar.cpp:130
+#: kcmtaskbar.cpp:218
msgid "Classic"
msgstr "经典"
-#: kcmtaskbar.cpp:131
+#: kcmtaskbar.cpp:219
msgid "For Transparency"
msgstr "透明"
-#: kcmtaskbar.cpp:144
+#: kcmtaskbar.cpp:232
msgid ""
"<h1>Taskbar</h1> You can configure the taskbar here. This includes options such "
"as whether or not the taskbar should show all windows at once or only those on "
@@ -99,63 +125,99 @@ msgid ""
msgstr ""
"<h1>任务栏</h1>您可在此配置任务栏。这里包括一些选项,如是否在任务栏上显示所有窗口或只显示当前桌面上的窗口。您还可以配置是否显示窗口列表按钮。"
-#: kcmtaskbar.cpp:176
+#: kcmtaskbar.cpp:270
msgid "kcmtaskbar"
msgstr "kcmtaskbar"
-#: kcmtaskbar.cpp:177
+#: kcmtaskbar.cpp:271
msgid "TDE Taskbar Control Module"
msgstr "TDE 任务栏控制模块"
-#: kcmtaskbar.cpp:179
+#: kcmtaskbar.cpp:273
msgid "(c) 2000 - 2001 Matthias Elter"
msgstr "(C) 2000 - 2001 Matthias Elter"
-#: kcmtaskbar.cpp:182
+#: kcmtaskbar.cpp:276
msgid "TDEConfigXT conversion"
msgstr "TDEConfigXT 转换"
-#: kcmtaskbar.cpp:209 kcmtaskbar.cpp:210 kcmtaskbar.cpp:211
+#: kcmtaskbar.cpp:364 kcmtaskbar.cpp:365 kcmtaskbar.cpp:366
msgid "Cycle Through Windows"
msgstr "在窗口间循环"
-#: kcmtaskbar.cpp:243
+#: kcmtaskbar.cpp:398
msgid "Custom"
msgstr "自定义"
#. i18n: file kcmtaskbarui.ui line 16
-#: rc.cpp:3 rc.cpp:6
+#: rc.cpp:3 rc.cpp:27
#, no-c-format
msgid "Taskbar"
msgstr "任务栏"
-#. i18n: file kcmtaskbarui.ui line 47
+#. i18n: file kcmtaskbarui.ui line 32
+#: rc.cpp:6
+#, no-c-format
+msgid "Settings"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 43
#: rc.cpp:9
#, no-c-format
-msgid "Sort windows by desk&top"
-msgstr "按桌面排序窗口(&T)"
+msgid ""
+"<b>NOTE: Currently you are editing the global taskbar configuration.</b>"
+"<br>To change the configuration of a specific taskbar (when using multiple "
+"taskbars), use the corresponding Configure Taskbar menu option, located in the "
+"taskbar handle popup menu."
+msgstr ""
-#. i18n: file kcmtaskbarui.ui line 55
+#. i18n: file kcmtaskbarui.ui line 51
#: rc.cpp:12
#, no-c-format
msgid ""
-"Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\n"
-"\n"
-"By default this option is selected."
+"<b>NOTE:</b> Currently you are editing the taskbar configuration for <b>only</b> "
+"this taskbar."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 59
+#: rc.cpp:15
+#, no-c-format
+msgid "Use global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 65
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Selecting this option causes the taskbar to use the global taskbar "
+"configuration."
msgstr ""
"选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
"\n"
"默认情况下,此选项是选中的。"
-#. i18n: file kcmtaskbarui.ui line 63
-#: rc.cpp:17
+#. i18n: file kcmtaskbarui.ui line 73
+#: rc.cpp:21
+#, no-c-format
+msgid ""
+"Overwrite current configuration with the current global floating taskbar "
+"configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 81
+#: rc.cpp:24
+#, no-c-format
+msgid "Edt global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 106
+#: rc.cpp:30
#, no-c-format
msgid "&Show windows from all desktops"
msgstr "显示全部桌面中的窗口(&S)"
-#. i18n: file kcmtaskbarui.ui line 71
-#: rc.cpp:20
+#. i18n: file kcmtaskbarui.ui line 114
+#: rc.cpp:33
#, no-c-format
msgid ""
"Turning this option off will cause the taskbar to display <b>only</b> "
@@ -167,56 +229,78 @@ msgstr ""
"\n"
"默认情况下,此选项为选中状态,即会显示全部窗口。"
-#. i18n: file kcmtaskbarui.ui line 79
-#: rc.cpp:25
+#. i18n: file kcmtaskbarui.ui line 122
+#: rc.cpp:38
#, no-c-format
-msgid "Show window list &button"
-msgstr "显示窗口列表按钮(&B)"
+msgid "Sort windows by desk&top"
+msgstr "按桌面排序窗口(&T)"
-#. i18n: file kcmtaskbarui.ui line 85
-#: rc.cpp:28
+#. i18n: file kcmtaskbarui.ui line 130
+#: rc.cpp:41
#, no-c-format
msgid ""
-"Selecting this option causes the taskbar to display a button that, when "
-"clicked, shows a list of all windows in a popup menu."
-msgstr "选择此按钮将导致任务栏显示一个按钮,单击该按钮时将弹出一个包含全部窗口列表的弹出菜单。"
+"Selecting this option causes the taskbar to show windows in order of the "
+"desktop they appear on.\n"
+"\n"
+"By default this option is selected."
+msgstr ""
+"选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
+"\n"
+"默认情况下,此选项是选中的。"
-#. i18n: file kcmtaskbarui.ui line 105
-#: rc.cpp:31
+#. i18n: file kcmtaskbarui.ui line 138
+#: rc.cpp:46
+#, no-c-format
+msgid "Show windows from all sc&reens"
+msgstr "显示全部屏幕中的窗口(&R)"
+
+#. i18n: file kcmtaskbarui.ui line 146
+#: rc.cpp:49
#, no-c-format
msgid ""
-"The taskbar can group similar windows into single buttons. When one of these "
-"window group buttons are clicked on a menu appears showing all the windows in "
-"that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\n"
-"\n"
-"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
-"Always</strong> group windows or to group windows only <strong>"
-"When the Taskbar is Full</strong>.\n"
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"windows which are on the same Xinerama screen as the taskbar.\n"
"\n"
-"By default the taskbar groups windows when it is full."
+"By default, this option is selected and all windows are shown."
msgstr ""
-"任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后,会出现一个菜单,其中显示了改组中的全部窗口。<em>显示全部窗口</em>选项可能会非常有用。\n"
-"\n"
-"您可以将任务栏设置为<strong>从不</strong>分组窗口,<strong>总是</strong>分组窗口,或者是仅当<strong>"
-"任务栏满时</strong>。\n"
+"关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\n"
"\n"
-"默认情况下,系统会在任务栏满时对窗口进行分组。"
+"默认情况下,此选项为选中状态,即会显示全部窗口。"
-#. i18n: file kcmtaskbarui.ui line 113
-#: rc.cpp:38
+#. i18n: file kcmtaskbarui.ui line 154
+#: rc.cpp:54
#, no-c-format
-msgid "&Group similar tasks:"
-msgstr "相似任务分组(&G):"
+msgid "Sort alphabeticall&y by application name"
+msgstr "按应用程序字母顺序排序(&Y)"
-#. i18n: file kcmtaskbarui.ui line 124
-#: rc.cpp:41
+#. i18n: file kcmtaskbarui.ui line 165
+#: rc.cpp:57
+#, no-c-format
+msgid "&Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 171
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 179
+#: rc.cpp:63
+#, fuzzy, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr "在窗口间循环"
+
+#. i18n: file kcmtaskbarui.ui line 190
+#: rc.cpp:66
#, no-c-format
msgid "Show o&nly minimized windows"
msgstr "只显示最小化的窗口(&N)"
-#. i18n: file kcmtaskbarui.ui line 129
-#: rc.cpp:44
+#. i18n: file kcmtaskbarui.ui line 195
+#: rc.cpp:69
#, no-c-format
msgid ""
"Select this option if you want the taskbar to display <b>only</b> "
@@ -228,100 +312,138 @@ msgstr ""
"\n"
"默认情况下,此选项未选中,任务栏将显示全部窗口。"
-#. i18n: file kcmtaskbarui.ui line 137
-#: rc.cpp:49
+#. i18n: file kcmtaskbarui.ui line 203
+#: rc.cpp:74
#, no-c-format
-msgid "Sho&w application icons"
-msgstr "显示程序图标(&W)"
+msgid "Show window list &button"
+msgstr "显示窗口列表按钮(&B)"
-#. i18n: file kcmtaskbarui.ui line 145
-#: rc.cpp:52
+#. i18n: file kcmtaskbarui.ui line 209
+#: rc.cpp:77
#, no-c-format
msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\n"
-"\n"
-"By default this option is selected."
+"Selecting this option causes the taskbar to display a button that, when "
+"clicked, shows a list of all windows in a popup menu."
+msgstr "选择此按钮将导致任务栏显示一个按钮,单击该按钮时将弹出一个包含全部窗口列表的弹出菜单。"
+
+#. i18n: file kcmtaskbarui.ui line 217
+#: rc.cpp:80
+#, no-c-format
+msgid "Dis&play:"
msgstr ""
-"如果您想要在任务栏中同时显示窗口图标及其标题,请选择此选项。\n"
-"\n"
-"默认情况下,此选项是选中的。"
-#. i18n: file kcmtaskbarui.ui line 153
-#: rc.cpp:57
+#. i18n: file kcmtaskbarui.ui line 236
+#: rc.cpp:83
#, no-c-format
-msgid "Show windows from all sc&reens"
-msgstr "显示全部屏幕中的窗口(&R)"
+msgid ""
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>."
+msgstr ""
-#. i18n: file kcmtaskbarui.ui line 161
-#: rc.cpp:60
+#. i18n: file kcmtaskbarui.ui line 256
+#: rc.cpp:86
#, no-c-format
msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\n"
+"The taskbar can group similar windows into single buttons. When one of these "
+"window group buttons are clicked on a menu appears showing all the windows in "
+"that group. This can be especially useful with the <em>Show all windows</em> "
+"option.\n"
"\n"
-"By default, this option is selected and all windows are shown."
+"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
+"Always</strong> group windows or to group windows only <strong>"
+"When the Taskbar is Full</strong>.\n"
+"\n"
+"By default the taskbar groups windows when it is full."
msgstr ""
-"关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\n"
+"任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后,会出现一个菜单,其中显示了改组中的全部窗口。<em>显示全部窗口</em>选项可能会非常有用。\n"
"\n"
-"默认情况下,此选项为选中状态,即会显示全部窗口。"
+"您可以将任务栏设置为<strong>从不</strong>分组窗口,<strong>总是</strong>分组窗口,或者是仅当<strong>"
+"任务栏满时</strong>。\n"
+"\n"
+"默认情况下,系统会在任务栏满时对窗口进行分组。"
+
+#. i18n: file kcmtaskbarui.ui line 264
+#: rc.cpp:93
+#, no-c-format
+msgid "&Group similar tasks:"
+msgstr "相似任务分组(&G):"
-#. i18n: file kcmtaskbarui.ui line 174
-#: rc.cpp:65
+#. i18n: file kcmtaskbarui.ui line 283
+#: rc.cpp:96
+#, no-c-format
+msgid ""
+"The taskbar can show and/or hide tasks based on their current process state. "
+"Select <em>Any</em> to show all tasks regardless of current state."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 291
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid "&Show tasks with state:"
+msgstr "显示任务列表"
+
+#. i18n: file kcmtaskbarui.ui line 307
+#: rc.cpp:102
#, no-c-format
msgid "A&ppearance:"
msgstr "外观(&P):"
-#. i18n: file kcmtaskbarui.ui line 188
-#: rc.cpp:68
+#. i18n: file kcmtaskbarui.ui line 321
+#: rc.cpp:105
#, no-c-format
msgid "Use &custom colors"
msgstr "使用自定义颜色(&C)"
-#. i18n: file kcmtaskbarui.ui line 257
-#: rc.cpp:71
-#, no-c-format
-msgid "&Background color:"
-msgstr "背景颜色(&B):"
-
-#. i18n: file kcmtaskbarui.ui line 276
-#: rc.cpp:74
+#. i18n: file kcmtaskbarui.ui line 340
+#: rc.cpp:108
#, no-c-format
msgid "Inacti&ve task text color:"
msgstr "非活动任务的文本颜色(&V):"
-#. i18n: file kcmtaskbarui.ui line 287
-#: rc.cpp:77
+#. i18n: file kcmtaskbarui.ui line 376
+#: rc.cpp:111
#, no-c-format
msgid "Active task te&xt color:"
msgstr "活动任务的文本颜色(&X):"
-#. i18n: file kcmtaskbarui.ui line 334
-#: rc.cpp:80
+#. i18n: file kcmtaskbarui.ui line 412
+#: rc.cpp:114
#, no-c-format
-msgid "Sort alphabeticall&y by application name"
-msgstr "按应用程序字母顺序排序(&Y)"
+msgid "&Background color:"
+msgstr "背景颜色(&B):"
-#. i18n: file kcmtaskbarui.ui line 347
-#: rc.cpp:83
+#. i18n: file kcmtaskbarui.ui line 469
+#: rc.cpp:117
#, no-c-format
msgid "Actions"
msgstr "动作"
-#. i18n: file kcmtaskbarui.ui line 358
-#: rc.cpp:86
+#. i18n: file kcmtaskbarui.ui line 480
+#: rc.cpp:120
#, no-c-format
msgid "&Left button:"
msgstr "左键(&L):"
-#. i18n: file kcmtaskbarui.ui line 369
-#: rc.cpp:89
+#. i18n: file kcmtaskbarui.ui line 491
+#: rc.cpp:123
#, no-c-format
msgid "&Middle button:"
msgstr "中键(&M):"
-#. i18n: file kcmtaskbarui.ui line 380
-#: rc.cpp:92
+#. i18n: file kcmtaskbarui.ui line 502
+#: rc.cpp:126
#, no-c-format
msgid "Right b&utton:"
msgstr "右键(&U):"
+
+#~ msgid "Sho&w application icons"
+#~ msgstr "显示程序图标(&W)"
+
+#~ msgid ""
+#~ "Select this option if you want window icons to appear along with their titles in the taskbar.\n"
+#~ "\n"
+#~ "By default this option is selected."
+#~ msgstr ""
+#~ "如果您想要在任务栏中同时显示窗口图标及其标题,请选择此选项。\n"
+#~ "\n"
+#~ "默认情况下,此选项是选中的。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po b/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
index ba9abbcbf66..f9fdc9f175d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
@@ -4,136 +4,186 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkdnssd\n"
-"POT-Creation-Date: 2005-10-13 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 07:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kcmdnssd.cpp:53
+#: kcmdnssd.cpp:59
msgid "kcm_tdednssd"
msgstr "kcm_tdednssd"
-#: kcmdnssd.cpp:54
+#: kcmdnssd.cpp:60
msgid "ZeroConf configuration"
msgstr "ZeroConf 配置"
-#: kcmdnssd.cpp:55
+#: kcmdnssd.cpp:61
msgid "(C) 2004,2005 Jakub Stachowski"
msgstr "(C) 2004,2005 Jakub Stachowski"
-#: kcmdnssd.cpp:56
+#: kcmdnssd.cpp:62
msgid "Setup services browsing with ZeroConf"
msgstr "用 ZeroConf 设置服务浏览"
+#: kcmdnssd.cpp:96
+msgid ""
+"Enabling local network browsing will open a network port (5353) on your "
+"computer. If security problems are discovered in the zeroconf server, remote "
+"attackers could access your computer as the \"avahi\" user."
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Zeroconf Network Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Don't Enable Browsing"
+msgstr ""
+
#. i18n: file configdialog.ui line 30
-#: rc.cpp:3 rc.cpp:55
+#: rc.cpp:3 rc.cpp:73
#, no-c-format
msgid "MyDialog1"
msgstr "MyDialog1"
#. i18n: file configdialog.ui line 45
-#: rc.cpp:6 rc.cpp:58
+#: rc.cpp:6 rc.cpp:76
#, no-c-format
msgid "&General"
msgstr "常规(&G)"
-#. i18n: file configdialog.ui line 56
-#: rc.cpp:9 rc.cpp:61
+#. i18n: file configdialog.ui line 67
+#: rc.cpp:9 rc.cpp:79
#, no-c-format
-msgid "Browse local networ&k"
-msgstr "浏览局域网(&K)"
+msgid "Publishing Mode"
+msgstr "发布模式"
-#. i18n: file configdialog.ui line 59
-#: rc.cpp:12 rc.cpp:64
+#. i18n: file configdialog.ui line 85
+#: rc.cpp:12 rc.cpp:82
#, no-c-format
-msgid "Browse local network (domain .local) using multicast DNS."
-msgstr "使用多播 DNS 浏览局域网(域为 .local)。"
+msgid "&Wide area network"
+msgstr "广域网(&W)"
-#. i18n: file configdialog.ui line 75
-#: rc.cpp:15 rc.cpp:67
+#. i18n: file configdialog.ui line 88
+#: rc.cpp:15 rc.cpp:85
#, no-c-format
-msgid "Additional Domains"
-msgstr "额外域"
+msgid "Alt+W"
+msgstr "Alt+W"
-#. i18n: file configdialog.ui line 79
-#: rc.cpp:18 rc.cpp:70
+#. i18n: file configdialog.ui line 91
+#: rc.cpp:18 rc.cpp:88
#, no-c-format
msgid ""
-"List of Internet domains that will be browsed for services. Do not put .local "
-"here - it\n"
-"is configured with 'Browse local network' option above."
-msgstr ""
-"列出要浏览服务的 Internet 域名。不要在此输入 .local - 它已经用上面的\n"
-"“浏览局域网”选项配置了。"
+"Advertise services on Internet domain using public IP. To have this option "
+"working you need to configure wide area operation in using administrator mode"
+msgstr "使用公开 IP 在 Internet 域中推广服务。要使此选项生效,您需要使用管理员模式配置广域操作。"
-#. i18n: file configdialog.ui line 95
-#: rc.cpp:22 rc.cpp:74
+#. i18n: file configdialog.ui line 107
+#: rc.cpp:21 rc.cpp:91
#, no-c-format
-msgid "Publishing Mode"
-msgstr "发布模式"
+msgid "Loc&al network"
+msgstr "局域网(&A)"
#. i18n: file configdialog.ui line 110
-#: rc.cpp:25 rc.cpp:77
+#: rc.cpp:24 rc.cpp:94
#, no-c-format
-msgid "Loc&al network"
-msgstr "局域网(&A)"
+msgid "Alt+A"
+msgstr "Alt+A"
#. i18n: file configdialog.ui line 116
-#: rc.cpp:28 rc.cpp:80
+#: rc.cpp:27 rc.cpp:97
#, no-c-format
msgid ""
"Advertise services on local network (in domain .local) using multicast DNS."
msgstr "使用多播 DNS 在局域网(域为 .local)内推广服务。"
-#. i18n: file configdialog.ui line 135
-#: rc.cpp:31 rc.cpp:83
+#. i18n: file configdialog.ui line 125
+#: rc.cpp:30 rc.cpp:100
#, no-c-format
-msgid "&Wide area network"
-msgstr "广域网(&W)"
+msgid "Browse local networ&k"
+msgstr "浏览局域网(&K)"
+
+#. i18n: file configdialog.ui line 128
+#: rc.cpp:33 rc.cpp:103
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#. i18n: file configdialog.ui line 131
+#: rc.cpp:36 rc.cpp:45 rc.cpp:106 rc.cpp:115
+#, no-c-format
+msgid "Browse local network (domain .local) using multicast DNS."
+msgstr "使用多播 DNS 浏览局域网(域为 .local)。"
+
+#. i18n: file configdialog.ui line 139
+#: rc.cpp:39 rc.cpp:109
+#, no-c-format
+msgid "Enable &Zeroconf network browsing"
+msgstr ""
+
+#. i18n: file configdialog.ui line 142
+#: rc.cpp:42 rc.cpp:112
+#, fuzzy, no-c-format
+msgid "Alt+Z"
+msgstr "Alt+K"
-#. i18n: file configdialog.ui line 138
-#: rc.cpp:34 rc.cpp:86
+#. i18n: file configdialog.ui line 161
+#: rc.cpp:48 rc.cpp:118
+#, no-c-format
+msgid "Additional Domains"
+msgstr "额外域"
+
+#. i18n: file configdialog.ui line 165
+#: rc.cpp:51 rc.cpp:121
#, no-c-format
msgid ""
-"Advertise services on Internet domain using public IP. To have this option "
-"working you need to configure wide area operation in using administrator mode"
-msgstr "使用公开 IP 在 Internet 域中推广服务。要使此选项生效,您需要使用管理员模式配置广域操作。"
+"List of Internet domains that will be browsed for services. Do not put .local "
+"here - it\n"
+"is configured with 'Browse local network' option above."
+msgstr ""
+"列出要浏览服务的 Internet 域名。不要在此输入 .local - 它已经用上面的\n"
+"“浏览局域网”选项配置了。"
-#. i18n: file configdialog.ui line 149
-#: rc.cpp:37 rc.cpp:89
+#. i18n: file configdialog.ui line 175
+#: rc.cpp:55 rc.cpp:125
#, no-c-format
msgid "W&ide area"
msgstr "广域(&I)"
-#. i18n: file configdialog.ui line 168
-#: rc.cpp:40 rc.cpp:92
+#. i18n: file configdialog.ui line 194
+#: rc.cpp:58 rc.cpp:128
#, no-c-format
msgid "Shared secret:"
msgstr "共享机密:"
-#. i18n: file configdialog.ui line 193
-#: rc.cpp:43 rc.cpp:95
+#. i18n: file configdialog.ui line 219
+#: rc.cpp:61 rc.cpp:131
#, no-c-format
msgid "Name of this machine. Must be in fully qualified form (host.domain)"
msgstr "此计算机的名称。必须是全程域名的格式(host.domain)"
-#. i18n: file configdialog.ui line 201
-#: rc.cpp:46 rc.cpp:98
+#. i18n: file configdialog.ui line 227
+#: rc.cpp:64 rc.cpp:134
#, no-c-format
msgid "Optional shared secret used for authorization of DNS dynamic updates."
msgstr "用于对 DNS 动态更新进行身份验证的共享机密。"
-#. i18n: file configdialog.ui line 212
-#: rc.cpp:49 rc.cpp:101
+#. i18n: file configdialog.ui line 238
+#: rc.cpp:67 rc.cpp:137
#, no-c-format
msgid "Domain:"
msgstr "域:"
-#. i18n: file configdialog.ui line 220
-#: rc.cpp:52 rc.cpp:104
+#. i18n: file configdialog.ui line 246
+#: rc.cpp:70 rc.cpp:140
#, no-c-format
msgid "Hostname:"
msgstr "主机名:"
@@ -160,14 +210,5 @@ msgstr "i18n-translation@lists.linux.net.cn"
#~ "如果选中此项,那么所配置的每个域都会进行查询,以便获得要浏览的域列表。\n"
#~ "这一过程是递归的。"
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+A"
-#~ msgstr "Alt+A"
-
-#~ msgid "Alt+W"
-#~ msgstr "Alt+W"
-
#~ msgid "Alt+I"
#~ msgstr "Alt+I"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po b/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
index f3e4ebe232a..7b13300f92d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmkio\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-14 18:42+0800\n"
"Last-Translator: Xiong Jiang <jxiong@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -298,13 +299,11 @@ msgid ""
"<qt>Enter a valid address or url."
"<p><b><u>NOTE:</u></b> Wildcard matching such as <code>*.kde.org</code> "
"is not supported. If you want to match any host in the <code>.kde.org</code> "
-"domain, then simply enter <code>"
-".kde.org</code></qt>"
+"domain, then simply enter <code>.kde.org</code></qt>"
msgstr ""
"<qt>输入有效地地址或 URL。"
"<p><b><u>注意:</u></b>不支持诸如 <code>*.kde.org</code> 的通配符。如果您想要匹配 <code>"
-".kde.org</code> 域下的任何主机,只需输入 <code>"
-".kde.org</code></qt>"
+".kde.org</code> 域下的任何主机,只需输入 <code>.kde.org</code></qt>"
#: kproxydlg.cpp:54
msgid "&Proxy"
@@ -1062,7 +1061,7 @@ msgstr "自动检测代理服务器配置(&U)"
#. i18n: file kproxydlg_ui.ui line 83
#: rc.cpp:284
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"<qt>\n"
"Automatically detect and configure the proxy settings."
@@ -1072,7 +1071,8 @@ msgid ""
"<p>\n"
"<b>NOTE:</b> This option might not work properly or not work at all in some "
"UNIX/Linux distributions. If you encounter a problem when using this option, "
-"please check the FAQ section at http://konqueror.kde.org.\n"
+"please contact the Trinity developers or file a bug report at "
+"http://bugs.trinitydesktop.org/.\n"
"</qt>"
msgstr ""
"<qt>\n"
@@ -1372,11 +1372,11 @@ msgstr "域名(&D):"
#. i18n: file policydlg_ui.ui line 35
#: rc.cpp:443 rc.cpp:448
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"<qt>\n"
-"Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</b> "
-"or <b>.kde.org</b>.\n"
+"Enter the host or domain to which this policy applies, e.g. <b>"
+"www.trinitydesktop.org</b> or <b>.trinitydesktop.org</b>.\n"
"</qt>"
msgstr ""
"<qt>\n"
@@ -1636,12 +1636,12 @@ msgstr ""
#. i18n: file useragentdlg_ui.ui line 19
#: rc.cpp:598
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"<qt>\n"
"Here you can modify the default browser-identification text or set a site <code>"
-"(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> "
-"specific identification text."
+"(eg. www.trinitydesktop.org)</code> or a domain <code>"
+"(eg. trinitydesktop.org)</code> specific identification text."
"<p>\n"
"To add a new site specific identification text, click the <code>New</code> "
"button and supply the necessary information. To change an existing site "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po b/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
index dc2beff74bc..fa6f3f6029d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2005-10-28 02:43+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-17 11:43+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,8 @@ msgid "Buttons"
msgstr "按钮"
#: buttons.cpp:611
-msgid "TDE"
+#, fuzzy
+msgid "KDE"
msgstr "TDE"
#: buttons.cpp:663
@@ -83,97 +85,243 @@ msgstr "菜单"
msgid "--- spacer ---"
msgstr "--- 分隔符 ---"
-#: twindecoration.cpp:90
+#: preview.cpp:48
+msgid ""
+"No preview available.\n"
+"Most probably there\n"
+"was a problem loading the plugin."
+msgstr ""
+"没有可用的预览。\n"
+"很可能是装入插件出现了问题。"
+
+#: preview.cpp:330
+msgid "Active Window"
+msgstr "激活窗口"
+
+#: preview.cpp:330
+msgid "Inactive Window"
+msgstr "非激活窗口"
+
+#: twindecoration.cpp:95
msgid ""
"Select the window decoration. This is the look and feel of both the window "
"borders and the window handle."
msgstr "选择窗口装饰。这是窗口边框的观感。"
-#: twindecoration.cpp:95
+#: twindecoration.cpp:100
msgid "Decoration Options"
msgstr "装饰选项"
-#: twindecoration.cpp:105
+#: twindecoration.cpp:110
msgid "B&order size:"
msgstr "边框大小(&O):"
-#: twindecoration.cpp:108
+#: twindecoration.cpp:113
msgid "Use this combobox to change the border size of the decoration."
msgstr "使用此组合框更改装饰的边框大小。"
-#: twindecoration.cpp:124
+#: twindecoration.cpp:129
msgid "&Show window button tooltips"
msgstr "显示窗口按钮提示(&S)"
-#: twindecoration.cpp:126
+#: twindecoration.cpp:131
msgid ""
"Enabling this checkbox will show window button tooltips. If this checkbox is "
"off, no window button tooltips will be shown."
msgstr "激活该选项用于显示窗口按钮提示。如果该选项没有选中,窗口按钮提示将不会显示。"
-#: twindecoration.cpp:130
+#: twindecoration.cpp:135
msgid "Use custom titlebar button &positions"
msgstr "使用定制的标题条按钮位置(&P)"
-#: twindecoration.cpp:132
+#: twindecoration.cpp:137
msgid ""
"The appropriate settings can be found in the \"Buttons\" Tab; please note that "
"this option is not available on all styles yet."
msgstr "相应的设置可以“按钮”标签卡中找到;请注意,该选项并非适用于全部样式。"
-#: twindecoration.cpp:163
+#: twindecoration.cpp:155
+msgid "NOTICE:"
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid "A third party Window Manager has been selected for use with TDE."
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid ""
+"As a result, the built-in Window Manager configuration system will not function "
+"and has been disabled."
+msgstr ""
+
+#: twindecoration.cpp:182
+msgid "&Draw a drop shadow under windows"
+msgstr ""
+
+#: twindecoration.cpp:184
+msgid ""
+"Enabling this checkbox will allow you to choose a kind of drop shadow to draw "
+"under each window."
+msgstr ""
+
+#: twindecoration.cpp:188
+#, fuzzy
+msgid "Active Window Shadow"
+msgstr "激活窗口"
+
+#: twindecoration.cpp:190
+#, fuzzy
+msgid "Inactive Window Shadows"
+msgstr "非激活窗口"
+
+#: twindecoration.cpp:192
+msgid "Draw Shadow Under Normal Windows And..."
+msgstr ""
+
+#: twindecoration.cpp:194
+msgid "Docks and &panels"
+msgstr ""
+
+#: twindecoration.cpp:198
+msgid "O&verride windows"
+msgstr ""
+
+#: twindecoration.cpp:202
+msgid "&Top menu"
+msgstr ""
+
+#: twindecoration.cpp:207
+msgid "Draw shadow under &inactive windows"
+msgstr ""
+
+#: twindecoration.cpp:213 twindecoration.cpp:219
+msgid "Colour:"
+msgstr ""
+
+#: twindecoration.cpp:225 twindecoration.cpp:241
+msgid "Maximum opacity:"
+msgstr ""
+
+#: twindecoration.cpp:262 twindecoration.cpp:272
+msgid "Offset rightward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:265 twindecoration.cpp:276 twindecoration.cpp:286
+#: twindecoration.cpp:297 twindecoration.cpp:308 twindecoration.cpp:319
+msgid " pixels"
+msgstr ""
+
+#: twindecoration.cpp:283 twindecoration.cpp:293
+msgid "Offset downward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:304 twindecoration.cpp:315
+msgid "Thickness to either side of window:"
+msgstr ""
+
+#: twindecoration.cpp:330
+msgid ""
+"Select the window manager. Selecting a window manager other than \"twin\" will "
+"require you to use a third party program for configuration and may increase the "
+"risk of system crashes or security problems."
+msgstr ""
+
+#: twindecoration.cpp:333
+msgid "Window Manager to use in your TDE session:"
+msgstr ""
+
+#: twindecoration.cpp:337
+msgid ""
+"Specify any command line arguments to be passed to the selected WM on startup, "
+"separated with whitespace. A common example is --replace"
+msgstr ""
+
+#: twindecoration.cpp:339
+msgid ""
+"Command line arguments to pass to the Window Manager (should remain blank "
+"unless needed):"
+msgstr ""
+
+#: twindecoration.cpp:353
msgid "&Window Decoration"
msgstr "窗口装饰(&W)"
-#: twindecoration.cpp:164
+#: twindecoration.cpp:354
msgid "&Buttons"
msgstr "按钮(&B)"
-#: twindecoration.cpp:182
+#: twindecoration.cpp:355
+#, fuzzy
+msgid "&Shadows"
+msgstr "卷起"
+
+#: twindecoration.cpp:356
+#, fuzzy
+msgid "&Window Manager"
+msgstr "窗口装饰(&W)"
+
+#: twindecoration.cpp:382
msgid "kcmtwindecoration"
msgstr "kcmtwindecoration"
-#: twindecoration.cpp:183
+#: twindecoration.cpp:383
msgid "Window Decoration Control Module"
msgstr "窗口装饰控制模块"
-#: twindecoration.cpp:185
+#: twindecoration.cpp:385
msgid "(c) 2001 Karol Szwed"
msgstr "(C) 2001 Karol Szwed"
-#: twindecoration.cpp:237 twindecoration.cpp:439
-msgid "TDE 2"
+#: twindecoration.cpp:437 twindecoration.cpp:695
+#, fuzzy
+msgid "KDE 2"
msgstr "TDE 2"
-#: twindecoration.cpp:266
+#: twindecoration.cpp:458
+msgid "(KDE4's window manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Compiz Effects Manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Simple, fast window manager)"
+msgstr ""
+
+#: twindecoration.cpp:460
+msgid "(Default TDE window manager)"
+msgstr ""
+
+#: twindecoration.cpp:522
msgid "Tiny"
msgstr "小"
-#: twindecoration.cpp:267
+#: twindecoration.cpp:523
msgid "Normal"
msgstr "中"
-#: twindecoration.cpp:268
+#: twindecoration.cpp:524
msgid "Large"
msgstr "大"
-#: twindecoration.cpp:269
+#: twindecoration.cpp:525
msgid "Very Large"
msgstr "很大"
-#: twindecoration.cpp:270
+#: twindecoration.cpp:526
msgid "Huge"
msgstr "巨大"
-#: twindecoration.cpp:271
+#: twindecoration.cpp:527
msgid "Very Huge"
msgstr "超大"
-#: twindecoration.cpp:272
+#: twindecoration.cpp:528
msgid "Oversized"
msgstr "最大"
-#: twindecoration.cpp:591
+#: twindecoration.cpp:949
msgid ""
"<h1>Window Manager Decoration</h1>"
"<p>This module allows you to choose the window border decorations, as well as "
@@ -193,20 +341,3 @@ msgstr ""
"<p>您可以在“配置 [...]”标签中配置每个主题。每个主题都有其不同的选项。</p>"
"<p>您可以在“常规选项(如果有的话)”中激活“按钮”标签,方法是选中“使用自定义标题栏按钮位置”框。在“按钮”标签中,您可以按您自己的喜好更改按钮的位置。</"
"p>"
-
-#: preview.cpp:48
-msgid ""
-"No preview available.\n"
-"Most probably there\n"
-"was a problem loading the plugin."
-msgstr ""
-"没有可用的预览。\n"
-"很可能是装入插件出现了问题。"
-
-#: preview.cpp:330
-msgid "Active Window"
-msgstr "激活窗口"
-
-#: preview.cpp:330
-msgid "Inactive Window"
-msgstr "非激活窗口"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po b/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
index fe4d73148ea..3cd69ebff14 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmtwinrules\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-21 17:06+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -102,11 +103,12 @@ msgid "(c) 2004 KWin and KControl Authors"
msgstr "(c) 2004 KWin 和 KControl 作者"
#: kcm.cpp:81
+#, fuzzy
msgid ""
"<h1>Window-specific Settings</h1> Here you can customize window settings "
"specifically only for some windows. "
"<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
"refer to its documentation for how to customize window behavior."
msgstr ""
"<h1>窗口特定的设置</h1>您可在此自定义仅对某些窗口生效的窗口设置。"
@@ -135,11 +137,12 @@ msgid "Window settings for %1"
msgstr "%1 的窗口设置"
#: main.cpp:279
-msgid "KWin"
-msgstr "KWin"
+msgid "TWin"
+msgstr ""
#: main.cpp:280
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
msgstr "KWin 助手工具"
#: main.cpp:290
@@ -833,3 +836,6 @@ msgstr "请查看文档中的更多信息。"
#: ruleswidget.cpp:749
msgid "Edit Shortcut"
msgstr "编辑快捷键"
+
+#~ msgid "KWin"
+#~ msgstr "KWin"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmusb.po b/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
index 00a2e99f9fd..6b48ff4d7ef 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmusb\n"
-"POT-Creation-Date: 2006-06-21 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-09-23 00:58+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po b/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
index c449a4d37b2..cd26f0e572e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmview1394\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-11-13 10:47+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +86,7 @@ msgstr "制造商"
msgid "Generate 1394 Bus Reset"
msgstr "复位1394总线"
-#: view1394.cpp:65
+#: view1394.cpp:64
msgid ""
"On the right hand side you can see some information about your IEEE 1394 "
"configuration."
@@ -116,20 +117,20 @@ msgstr ""
"<br><b>速度</b>:节点速度"
"<br>"
-#: view1394.cpp:196
+#: view1394.cpp:195
msgid "Port %1:\"%2\""
msgstr "端口 %1:“%2”"
-#: view1394.cpp:209
+#: view1394.cpp:208
#, c-format
msgid "Node %1"
msgstr "节点 %1"
-#: view1394.cpp:212
+#: view1394.cpp:211
msgid "Not ready"
msgstr "未就绪"
-#: view1394.cpp:316
+#: view1394.cpp:315
msgid "Unknown"
msgstr "未知"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po b/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
index 59cdc4a9833..a8faf563931 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmxinerama\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-09 15:39+0800\n"
"Last-Translator: Dick Zhang <netwind2000@etang.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcontrol.po b/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
index e50d1c85288..27f44b9afda 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-01-05 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:24+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgid ""
"configuration module."
msgstr "欢迎使用Trinity 控制中心。您可以在这里集中配置您的桌面环境。请从左边的列表中选择一项来载入一个配置模块。"
-#: aboutwidget.cpp:53 main.cpp:108
+#: aboutwidget.cpp:53
msgid "Trinity Info Center"
msgstr "Trinity 信息中心"
@@ -92,7 +93,7 @@ msgstr "机器:"
msgid "<big><b>Loading...</b></big>"
msgstr "<big><b>正在载入...</b></big>"
-#: dockcontainer.cpp:201 toplevel.cpp:376
+#: dockcontainer.cpp:201 toplevel.cpp:371
msgid ""
"There are unsaved changes in the active module.\n"
"Do you want to apply the changes before running the new module or discard the "
@@ -101,7 +102,7 @@ msgstr ""
"在活动的模块中有未保存的修改。\n"
"您想在运行新的模块前应用修改,还是放弃修改?"
-#: dockcontainer.cpp:204 toplevel.cpp:379
+#: dockcontainer.cpp:204 toplevel.cpp:374
msgid ""
"There are unsaved changes in the active module.\n"
"Do you want to apply the changes before exiting the Control Center or discard "
@@ -110,7 +111,7 @@ msgstr ""
"在活动的模块中有未保存的修改。\n"
"您想在退出控制中心前应用修改,还是放弃修改?"
-#: dockcontainer.cpp:207 toplevel.cpp:382
+#: dockcontainer.cpp:207 toplevel.cpp:377
msgid "Unsaved Changes"
msgstr "未保存的修改"
@@ -122,19 +123,7 @@ msgstr ""
"<p>使用“这是什么”(Shift+F1)获得关于特定选项的帮助。</p>"
"<p>要阅读完整手册,请点击<a href=\"%1\">这里</a>。</p>"
-#: helpwidget.cpp:51
-msgid ""
-"<h1>TDE Info Center</h1>There is no quick help available for the active info "
-"module."
-"<br>"
-"<br>Click <a href = \"kinfocenter/index.html\">here</a> "
-"to read the general Info Center manual."
-msgstr ""
-"<h1>TDE 信息中心</h1>抱歉,活动的信息模块没有可供使用的快速帮助。"
-"<br>"
-"<br>点击<a href=\"kinfocenter/index.html\">这里</a>来阅读通用的信息中心手册。"
-
-#: helpwidget.cpp:56
+#: helpwidget.cpp:50
msgid ""
"<h1>Trinity Control Center</h1>There is no quick help available for the active "
"control module."
@@ -156,18 +145,19 @@ msgstr "<big>您需要超级用户权限来运行这个控制模块。</big><br>
msgid "The Trinity Control Center"
msgstr "TDE 控制中心"
-#: main.cpp:106 main.cpp:110
+#: main.cpp:106
msgid "(c) 1998-2004, The Trinity Control Center Developers"
msgstr "(c) 1998-2004,TDE 控制中心开发者"
-#: main.cpp:109
-msgid "The TDE Info Center"
-msgstr "TDE 信息中心"
-
-#: main.cpp:128 main.cpp:130
+#: main.cpp:115
msgid "Current Maintainer"
msgstr "当前维护者"
+#: main.cpp:116
+#, fuzzy
+msgid "Previous Maintainer"
+msgstr "当前维护者"
+
#: modules.cpp:160
msgid "<big>Loading...</big>"
msgstr "<big>正在载入...</big>"
@@ -211,13 +201,13 @@ msgid "&Administrator Mode"
msgstr "管理员模式(&A)"
#. i18n: file kcontrolui.rc line 5
-#: rc.cpp:6 rc.cpp:15
+#: rc.cpp:6
#, no-c-format
msgid "&Mode"
msgstr "模式(&M)"
#. i18n: file kcontrolui.rc line 9
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
#, no-c-format
msgid "Icon &Size"
msgstr "图标大小(&S)"
@@ -262,25 +252,31 @@ msgstr "大(&L)"
msgid "&Huge"
msgstr "巨大(&H)"
-#: toplevel.cpp:270 toplevel.cpp:392 toplevel.cpp:447
+#: toplevel.cpp:270 toplevel.cpp:387 toplevel.cpp:442
msgid "About Current Module"
msgstr "关于当前的模块"
-#: toplevel.cpp:281 toplevel.cpp:357
+#: toplevel.cpp:276 toplevel.cpp:352
msgid "&Report Bug..."
msgstr "报告错误(&R)..."
-#: toplevel.cpp:359
+#: toplevel.cpp:354
msgid "Report Bug on Module %1..."
msgstr "报告模块 %1 的错误..."
-#: toplevel.cpp:440
+#: toplevel.cpp:435
#, c-format
msgid ""
"_: Help menu->about <modulename>\n"
"About %1"
msgstr "关于 %1"
+#~ msgid "<h1>TDE Info Center</h1>There is no quick help available for the active info module.<br><br>Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual."
+#~ msgstr "<h1>TDE 信息中心</h1>抱歉,活动的信息模块没有可供使用的快速帮助。<br><br>点击<a href=\"kinfocenter/index.html\">这里</a>来阅读通用的信息中心手册。"
+
+#~ msgid "The TDE Info Center"
+#~ msgstr "TDE 信息中心"
+
#~ msgid "Choose between Index, Search and Quick Help"
#~ msgstr "选择索引、搜索和快速帮助之一"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdcop.po b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
index 53c08e032bd..e08580c97bf 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdcop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2007-05-15 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:28+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index 02e4d08bd79..efc051f6b95 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,58 +7,81 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-09 13:01+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Wang Jian <lark@linux.net.cn>\n"
"X-Generator: KBabel 1.0\n"
-#: lock/autologout.cc:39
+#: lock/autologout.cc:42
+msgid "Automatic Logout Notification"
+msgstr ""
+
+#: lock/autologout.cc:54
msgid "<nobr><qt><b>Automatic Log Out</b></qt><nobr>"
msgstr "<nobr><qt><b>自动注销</b></qt><nobr>"
-#: lock/autologout.cc:40
+#: lock/autologout.cc:55
msgid ""
"<qt>To prevent being logged out, resume using this session by moving the mouse "
"or pressing a key.</qt>"
msgstr "<qt>为了避免被注销,请移动鼠标或者按任意键以便恢复此会话。</qt>"
-#: lock/autologout.cc:80
+#: lock/autologout.cc:97
#, c-format
msgid ""
"_n: <nobr><qt>You will be automatically logged out in 1 second</qt></nobr>\n"
"<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>"
msgstr "<nobr><qt>您将在 %n 秒后被自动注销</qt></nobr>"
-#: lock/lockdlg.cc:82
+#: lock/lockdlg.cc:110 lock/sakdlg.cc:76
+#, fuzzy
+msgid "Desktop Session Locked"
+msgstr "KDesktop 锁定程序"
+
+#: lock/lockdlg.cc:129 lock/lockdlg.cc:130
+msgid "This computer is in use and has been locked."
+msgstr ""
+
+#: lock/lockdlg.cc:130
+msgid "Only '%1' may unlock this session."
+msgstr ""
+
+#: lock/lockdlg.cc:134
msgid "<nobr><b>The session is locked</b><br>"
msgstr "<nobr><b>会话已经锁定</b><br>"
-#: lock/lockdlg.cc:83
+#: lock/lockdlg.cc:135
msgid "<nobr><b>The session was locked by %1</b><br>"
msgstr "<nobr><b>会话已经被 %1 锁定</b><br>"
-#: lock/lockdlg.cc:93
+#: lock/lockdlg.cc:140
+#, c-format
+msgid "This session has been locked since %1"
+msgstr ""
+
+#: lock/lockdlg.cc:151
msgid "Sw&itch User..."
msgstr "切换用户(&I)..."
-#: lock/lockdlg.cc:94
+#: lock/lockdlg.cc:152 lock/querydlg.cc:94
msgid "Unl&ock"
msgstr "取消锁定(&O)"
-#: lock/lockdlg.cc:191
+#: lock/lockdlg.cc:309
msgid "<b>Unlocking failed</b>"
msgstr "<b>取消锁定失败</b>"
-#: lock/lockdlg.cc:197
+#: lock/lockdlg.cc:316
msgid "<b>Warning: Caps Lock on</b>"
msgstr "<b>警告:大写状态</b>"
-#: lock/lockdlg.cc:423
+#: lock/lockdlg.cc:561
msgid ""
"Cannot unlock the session because the authentication system failed to work;\n"
"you must kill kdesktop_lock (pid %1) manually."
@@ -66,7 +89,16 @@ msgstr ""
"无法解锁会话,因为身份验证系统无法工作;\n"
"您必须手动杀死 kdesktop_lock (pid %1)。"
-#: lock/lockdlg.cc:526
+#: lock/lockdlg.cc:616 lock/lockprocess.cc:2395
+msgid "Authentication Subsystem Notice"
+msgstr ""
+
+#: lock/lockdlg.cc:673
+#, fuzzy
+msgid "New Session"
+msgstr "开始新会话"
+
+#: lock/lockdlg.cc:687
msgid ""
"You have chosen to open another desktop session instead of resuming the current "
"one."
@@ -82,95 +114,154 @@ msgstr ""
"<br>每个会话都指定了一个 Fn 功能键;F%1 通常被指定为第一个会话,F%2 被指定为第二个会话,依次类推。您可以同时按下 Ctrl、Alt 和对应的 "
"Fn 功能键在不同的会话之间切换。此外,TDE 面板和桌面菜单也可用于切换会话。"
-#: krootwm.cc:842 lock/lockdlg.cc:539
+#: krootwm.cc:899 lock/lockdlg.cc:700
msgid "&Start New Session"
msgstr "开始新会话(&S)"
-#: lock/lockdlg.cc:551
+#: lock/lockdlg.cc:712
msgid "&Do not ask again"
msgstr "不再询问(&D)"
-#: lock/lockdlg.cc:651
+#: kdesktopbindings.cpp:26 krootwm.cc:466 lock/lockdlg.cc:799
+#: lock/securedlg.cc:116
+msgid "Switch User"
+msgstr "切换用户"
+
+#: lock/lockdlg.cc:824
msgid "Session"
msgstr "会话"
-#: lock/lockdlg.cc:652
+#: lock/lockdlg.cc:825
msgid "Location"
msgstr "位置"
-#: lock/lockdlg.cc:678
+#: lock/lockdlg.cc:851
msgid ""
"_: session\n"
"&Activate"
msgstr "激活(&A)"
-#: lock/lockdlg.cc:687
+#: lock/lockdlg.cc:860
msgid "Start &New Session"
msgstr "开始新会话(&N)"
-#: lock/lockprocess.cc:742
+#: lock/lockprocess.cc:538 lock/lockprocess.cc:693
+msgid "Securing desktop session"
+msgstr ""
+
+#: lock/lockprocess.cc:1435
msgid ""
"Will not lock the session, as unlocking would be impossible:\n"
msgstr ""
"将不会锁定会话,因为取消锁定不可能:\n"
-#: lock/lockprocess.cc:746
+#: lock/lockprocess.cc:1439
msgid "Cannot start <i>kcheckpass</i>."
msgstr "无法启动 <i>kcheckpass</i>。"
-#: lock/lockprocess.cc:747
+#: lock/lockprocess.cc:1440
msgid "<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root."
msgstr "<i>kcheckpass</i> 无法操作。可能该程序未被 SetUID root。"
-#: lock/lockprocess.cc:790
+#: lock/lockprocess.cc:1483
msgid "No appropriate greeter plugin configured."
msgstr "没有配置恰当的欢迎插件。"
-#: lock/main.cc:54
+#: lock/main.cc:212
msgid "Force session locking"
msgstr "强制锁定会话"
-#: lock/main.cc:55
+#: lock/main.cc:213
msgid "Only start screensaver"
msgstr "仅启动屏幕保护程序"
-#: lock/main.cc:56
+#: lock/main.cc:214
+msgid "Launch the secure dialog"
+msgstr ""
+
+#: lock/main.cc:215
msgid "Only use the blank screensaver"
msgstr "仅使用空的屏幕保护程序"
-#: lock/main.cc:66
+#: lock/main.cc:216
+msgid "TDE internal command for background process loading"
+msgstr ""
+
+#: lock/main.cc:234
msgid "KDesktop Locker"
msgstr "KDesktop 锁定程序"
-#: lock/main.cc:66
+#: lock/main.cc:234
msgid "Session Locker for KDesktop"
msgstr "KDesktop 会话锁定程序"
-#: desktop.cc:771
+#: lock/querydlg.cc:74
+msgid "Information Needed"
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "Press Ctrl+Alt+Del to begin."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "This process helps keep your password secure."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "It prevents unauthorized users from emulating the login screen."
+msgstr ""
+
+#: lock/securedlg.cc:76
+#, fuzzy
+msgid "Secure Desktop Area"
+msgstr "刷新桌面"
+
+#: lock/securedlg.cc:95
+msgid "'%1' is currently logged on"
+msgstr ""
+
+#: lock/securedlg.cc:98
+msgid "You are currently logged on"
+msgstr ""
+
+#: kdesktopbindings.cpp:31 krootwm.cc:191 lock/securedlg.cc:104
+msgid "Lock Session"
+msgstr "锁住会话"
+
+#: lock/securedlg.cc:107
+#, fuzzy
+msgid "Task Manager"
+msgstr "显示任务管理器"
+
+#: lock/securedlg.cc:110
+msgid "Logoff Menu"
+msgstr ""
+
+#: desktop.cc:935
msgid "Set as Primary Background Color"
msgstr "设置为主背景色"
-#: desktop.cc:772
+#: desktop.cc:936
msgid "Set as Secondary Background Color"
msgstr "设置为次背景色"
-#: desktop.cc:789
+#: desktop.cc:953
msgid "&Save to Desktop..."
msgstr "保存到桌面(&S)..."
-#: desktop.cc:791
+#: desktop.cc:955
msgid "Set as &Wallpaper"
msgstr "设为墙纸(&W)"
-#: desktop.cc:799
+#: desktop.cc:963
msgid "Enter a name for the image below:"
msgstr "在下面输入图像的名称:"
-#: desktop.cc:808
+#: desktop.cc:972
msgid "image.png"
msgstr "image.png"
-#: desktop.cc:871
+#: desktop.cc:1035
msgid ""
"Could not log out properly.\n"
"The session manager cannot be contacted. You can try to force a shutdown by "
@@ -200,137 +291,153 @@ msgid ""
"to use another path."
msgstr "无法创建目录 %1;请检查权限或重新配置桌面以使用其它路径。"
-#: kdiconview.cc:437
+#: kdiconview.cc:444
msgid "&Rename"
msgstr "重命名(&R)"
-#: kdiconview.cc:438
+#: kdiconview.cc:445
msgid "&Properties"
msgstr "属性(&P)"
-#: kdiconview.cc:439
+#: kdiconview.cc:446
msgid "&Move to Trash"
msgstr "移至回收站(&M)"
-#: krootwm.cc:133
+#: kdiconview.cc:808
+msgid "You have chosen to remove a system icon"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "You can restore this icon in the future through the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "tab in the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "Behavior"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "pane of the Desktop Settings control module."
+msgstr ""
+
+#: krootwm.cc:134
msgid "Run Command..."
msgstr "运行命令..."
-#: krootwm.cc:137
+#: krootwm.cc:135
+msgid "Open Terminal Here..."
+msgstr ""
+
+#: krootwm.cc:141
msgid "Configure Desktop..."
msgstr "配置桌面..."
-#: krootwm.cc:139 krootwm.cc:364
+#: krootwm.cc:143 krootwm.cc:374
msgid "Disable Desktop Menu"
msgstr "禁用桌面菜单"
-#: krootwm.cc:143
+#: krootwm.cc:147
msgid "Unclutter Windows"
msgstr "散列窗口"
-#: krootwm.cc:145
+#: krootwm.cc:149
msgid "Cascade Windows"
msgstr "层叠窗口"
-#: krootwm.cc:151
+#: krootwm.cc:155
msgid "By Name (Case Sensitive)"
msgstr "按名称(区分大小写)"
-#: krootwm.cc:153
+#: krootwm.cc:157
msgid "By Name (Case Insensitive)"
msgstr "按名称(不区分大小写)"
-#: krootwm.cc:155
+#: krootwm.cc:159
msgid "By Size"
msgstr "按大小"
-#: krootwm.cc:157
+#: krootwm.cc:161
msgid "By Type"
msgstr "按类型"
-#: krootwm.cc:159
+#: krootwm.cc:163
msgid "By Date"
msgstr "按日期"
-#: krootwm.cc:162
+#: krootwm.cc:166
msgid "Directories First"
msgstr "目录在前"
-#: krootwm.cc:165
+#: krootwm.cc:169
msgid "Line Up Horizontally"
msgstr "水平排列图标"
-#: krootwm.cc:168
+#: krootwm.cc:172
msgid "Line Up Vertically"
msgstr "垂直排列图标"
-#: krootwm.cc:171
+#: krootwm.cc:175
msgid "Align to Grid"
msgstr "对齐到网格"
-#. i18n: file kdesktop.kcfg line 180
-#: krootwm.cc:175 rc.cpp:215
+#. i18n: file kdesktop.kcfg line 185
+#: krootwm.cc:179 rc.cpp:242
#, no-c-format
msgid "Lock in Place"
msgstr "就地锁定"
-#: krootwm.cc:181
+#: krootwm.cc:185
msgid "Refresh Desktop"
msgstr "刷新桌面"
-#: kdesktopbindings.cpp:31 krootwm.cc:187
-msgid "Lock Session"
-msgstr "锁住会话"
-
-#: krootwm.cc:192
+#: krootwm.cc:196
msgid "Log Out \"%1\"..."
msgstr "注销“%1”..."
-#: krootwm.cc:198
+#: krootwm.cc:202
msgid "Start New Session"
msgstr "开始新会话"
-#: krootwm.cc:202
+#: krootwm.cc:206
msgid "Lock Current && Start New Session"
msgstr "锁定当前会话并开始新会话"
-#: krootwm.cc:342 krootwm.cc:420
+#: krootwm.cc:352 krootwm.cc:434
msgid "Sort Icons"
msgstr "排序图标"
-#: krootwm.cc:344
+#: krootwm.cc:354
msgid "Line Up Icons"
msgstr "排列图标"
-#: krootwm.cc:371
+#: krootwm.cc:381
msgid "Enable Desktop Menu"
msgstr "启用桌面菜单"
-#: krootwm.cc:430
+#: krootwm.cc:444
msgid "Icons"
msgstr "图标"
-#: krootwm.cc:436 krootwm.cc:492
+#: krootwm.cc:450 krootwm.cc:506
msgid "Windows"
msgstr "窗口"
-#: kdesktopbindings.cpp:26 krootwm.cc:452
-msgid "Switch User"
-msgstr "切换用户"
-
-#: krootwm.cc:481
+#: krootwm.cc:495
msgid "Sessions"
msgstr "会话"
-#: krootwm.cc:485
+#: krootwm.cc:499
msgid "New"
msgstr "新建"
-#: kdesktopbindings.cpp:14 krootwm.cc:491
+#: kdesktopbindings.cpp:14 krootwm.cc:505
msgid "Desktop"
msgstr "桌面"
-#: krootwm.cc:830
+#: krootwm.cc:887
msgid ""
"<p>You have chosen to open another desktop session."
"<br>The current session will be hidden and a new login screen will be "
@@ -345,27 +452,32 @@ msgstr ""
"<br>每个会话都指定了一个 Fn 功能键;F%1 通常被指定为第一个会话,F%2 被指定为第二个会话,依次类推。您可以同时按下 Ctrl、Alt 和对应的 "
"Fn 功能键在不同的会话之间切换。此外,TDE 面板和桌面菜单也可用于切换会话。</p>"
-#: krootwm.cc:841
+#: krootwm.cc:898
msgid "Warning - New Session"
msgstr "警告 - 新会话"
-#: main.cc:46
+#: main.cc:58
msgid "The TDE desktop"
msgstr "TDE 桌面"
-#: main.cc:52
+#: main.cc:64
msgid "Use this if the desktop window appears as a real window"
msgstr "如果桌面窗口是真实窗口,使用此项"
-#: main.cc:53
+#: main.cc:65
msgid "Obsolete"
msgstr "废弃"
-#: main.cc:54
+#: main.cc:66
msgid "Wait for kded to finish building database"
msgstr "等待 kded 建完数据库"
-#: main.cc:153
+#: main.cc:68
+#, fuzzy
+msgid "Enable background transparency"
+msgstr "每个屏幕独立绘制背景"
+
+#: main.cc:171
msgid "KDesktop"
msgstr "KDesktop"
@@ -381,7 +493,7 @@ msgid ""
"Your emails"
msgstr "lark@linux.net.cn"
-#: kdesktopbindings.cpp:20 minicli.cpp:79
+#: kdesktopbindings.cpp:20 minicli.cpp:82
msgid "Run Command"
msgstr "运行命令"
@@ -393,45 +505,101 @@ msgstr "显示任务管理器"
msgid "Show Window List"
msgstr "显示窗口列表"
-#: kdesktopbindings.cpp:37
+#: kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "锁住会话"
+
+#: kdesktopbindings.cpp:38
+#, fuzzy
+msgid "Start Screen Saver"
+msgstr "仅启动屏幕保护程序"
+
+#: kdesktopbindings.cpp:44
msgid "Log Out"
msgstr "注销"
-#: kdesktopbindings.cpp:38
+#: kdesktopbindings.cpp:45
msgid "Log Out Without Confirmation"
msgstr "不需确认就注销"
-#: kdesktopbindings.cpp:39
+#: kdesktopbindings.cpp:46
msgid "Halt without Confirmation"
msgstr "不需确认就关机"
-#: kdesktopbindings.cpp:40
+#: kdesktopbindings.cpp:47
msgid "Reboot without Confirmation"
msgstr "不需确认就重新启动"
-#: minicli.cpp:93 minicli.cpp:639
+#: kxdglauncher.cpp:91
+msgid "XDG variable name to open"
+msgstr ""
+
+#: kxdglauncher.cpp:92
+msgid "Do not launch Konqueror; instead print path to directory if it exists)"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "TDE XDG File Browser Launcher and Prompter"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "Prompts if directory does not exist, otherwise launches"
+msgstr ""
+
+#: kxdglauncher.cpp:123
+msgid ""
+"Please confirm your Documents directory location"
+"<br>Upon confimation a new directory will be created"
+msgstr ""
+
+#: kxdglauncher.cpp:124
+msgid "Create Documents directory"
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Unable to create directory "
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Please check folder permissions and try again"
+msgstr ""
+
+#: kxdglauncher.cpp:167 kxdglauncher.cpp:172
+msgid "Unable to create directory"
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Unable to create the directory "
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Directory path cannot be longer than 4096 characters"
+msgstr ""
+
+#: minicli.cpp:96 minicli.cpp:795
msgid "&Options >>"
msgstr "选项(&O) >>"
-#: minicli.cpp:96
+#: minicli.cpp:99
msgid "&Run"
msgstr "运行(&R)"
-#: minicli.cpp:392
+#: minicli.cpp:452
msgid "<qt>The user <b>%1</b> does not exist on this system.</qt>"
msgstr "<qt>用户 <b>%1</b> 在这个系统中不存在。</qt>"
-#: minicli.cpp:402
+#: minicli.cpp:462
msgid ""
"You do not exist.\n"
msgstr ""
"您不存在。\n"
-#: minicli.cpp:427
+#: minicli.cpp:487
msgid "Incorrect password; please try again."
msgstr "不正确的密码;请重试。"
-#: minicli.cpp:538
+#: minicli.cpp:598
msgid ""
"<center><b>%1</b></center>\n"
"You do not have permission to execute this command."
@@ -439,7 +607,7 @@ msgstr ""
"<center><b>%1</b></center>\n"
"您没有权限执行该命令。"
-#: minicli.cpp:566
+#: minicli.cpp:626
msgid ""
"<center><b>%1</b></center>\n"
"Could not run the specified command."
@@ -447,7 +615,7 @@ msgstr ""
"<center><b>%1</b></center>\n"
"无法运行指定的命令。"
-#: minicli.cpp:578
+#: minicli.cpp:638
msgid ""
"<center><b>%1</b></center>\n"
"The specified command does not exist."
@@ -455,11 +623,11 @@ msgstr ""
"<center><b>%1</b></center>\n"
"指定的命令不存在。"
-#: minicli.cpp:627
+#: minicli.cpp:783
msgid "&Options <<"
msgstr "选项(&O) <<"
-#: minicli.cpp:832
+#: minicli.cpp:1000
msgid ""
"Running a realtime application can be very dangerous. If the application "
"misbehaves, the system might hang unrecoverably.\n"
@@ -469,11 +637,11 @@ msgstr ""
"可能会不可恢复地挂起。\n"
"您确定要继续吗?"
-#: minicli.cpp:835
+#: minicli.cpp:1003
msgid "Warning - Run Command"
msgstr "警告 - 运行命令"
-#: minicli.cpp:835
+#: minicli.cpp:1003
msgid "&Run Realtime"
msgstr "实时运行(&R)"
@@ -508,52 +676,97 @@ msgstr ""
"</ul>\n"
"</qt>"
-#. i18n: file minicli_ui.ui line 199
+#. i18n: file minicli_ui.ui line 188
#: rc.cpp:14
#, no-c-format
+msgid "Autocomplete shows available &applications"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 192
+#: rc.cpp:17
+#, no-c-format
+msgid ""
+"<qt>When enabled, the system shows available applications in the autocompletion "
+"area.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 200
+#: rc.cpp:21
+#, no-c-format
+msgid "Autocomplete uses &filesystem instead of history"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 204
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem or the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 212
+#: rc.cpp:28
+#, no-c-format
+msgid "Autocomplete uses &both history and filesystem"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 216
+#: rc.cpp:31
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem and the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 235
+#: rc.cpp:35
+#, no-c-format
msgid "User&name:"
msgstr "用户名(&N):"
-#. i18n: file minicli_ui.ui line 205
-#: rc.cpp:17 rc.cpp:47
+#. i18n: file minicli_ui.ui line 241
+#: rc.cpp:38 rc.cpp:68
#, no-c-format
msgid "Enter the user you want to run the application as here."
msgstr "在这里输入您要用来运行程序的用户。"
-#. i18n: file minicli_ui.ui line 224
-#: rc.cpp:20 rc.cpp:26
+#. i18n: file minicli_ui.ui line 260
+#: rc.cpp:41 rc.cpp:47
#, no-c-format
msgid "Enter the password here for the user you specified above."
msgstr "在这里输入您指定用户的密码。"
-#. i18n: file minicli_ui.ui line 243
-#: rc.cpp:23
+#. i18n: file minicli_ui.ui line 279
+#: rc.cpp:44
#, no-c-format
msgid "Pass&word:"
msgstr "密码(&W):"
-#. i18n: file minicli_ui.ui line 257
-#: rc.cpp:29
+#. i18n: file minicli_ui.ui line 293
+#: rc.cpp:50
#, no-c-format
msgid "Run in &terminal window"
msgstr "在终端窗口中运行(&T)"
-#. i18n: file minicli_ui.ui line 260
-#: rc.cpp:32
+#. i18n: file minicli_ui.ui line 296
+#: rc.cpp:53
#, no-c-format
msgid ""
"Check this option if the application you want to run is a text mode "
"application. The application will then be run in a terminal emulator window."
msgstr "如果您要运行的程序是文本模式的,请选中此选项。该程序将运行在模拟终端窗口中。"
-#. i18n: file minicli_ui.ui line 279
-#: rc.cpp:35
+#. i18n: file minicli_ui.ui line 315
+#: rc.cpp:56
#, no-c-format
msgid "&Priority:"
msgstr "优先级(&P):"
-#. i18n: file minicli_ui.ui line 285
-#: rc.cpp:38 rc.cpp:53 rc.cpp:59 rc.cpp:62
+#. i18n: file minicli_ui.ui line 321
+#: rc.cpp:59 rc.cpp:74 rc.cpp:80 rc.cpp:83
#, no-c-format
msgid ""
"The priority that the command will be run with can be set here. From left to "
@@ -561,14 +774,14 @@ msgid ""
"priorities higher than the default, you will need to provide the root password."
msgstr "这里可以设置要运行的命令的优先级。从左到右,从低到高。中间位置是默认值。要设置比默认值高的部分,就需要 root 的密码。"
-#. i18n: file minicli_ui.ui line 312
-#: rc.cpp:41
+#. i18n: file minicli_ui.ui line 348
+#: rc.cpp:62
#, no-c-format
msgid "Run with a &different priority"
msgstr "以不同的优先级运行(&D)"
-#. i18n: file minicli_ui.ui line 315
-#: rc.cpp:44
+#. i18n: file minicli_ui.ui line 351
+#: rc.cpp:65
#, no-c-format
msgid ""
"Check this option if you want to run the application with a different priority. "
@@ -576,26 +789,26 @@ msgid ""
"your application."
msgstr "如果您要用不同优先级运行该程序,启用该选项。指定高的优先级可以让系统分配更多的处理时间给该程序。"
-#. i18n: file minicli_ui.ui line 356
-#: rc.cpp:50
+#. i18n: file minicli_ui.ui line 392
+#: rc.cpp:71
#, no-c-format
msgid "Low"
msgstr "低"
-#. i18n: file minicli_ui.ui line 370
-#: rc.cpp:56
+#. i18n: file minicli_ui.ui line 406
+#: rc.cpp:77
#, no-c-format
msgid "High"
msgstr "高"
-#. i18n: file minicli_ui.ui line 411
-#: rc.cpp:65
+#. i18n: file minicli_ui.ui line 447
+#: rc.cpp:86
#, no-c-format
msgid "Run as a different &user"
msgstr "以不同的用户运行(&U)"
-#. i18n: file minicli_ui.ui line 414
-#: rc.cpp:68
+#. i18n: file minicli_ui.ui line 450
+#: rc.cpp:89
#, no-c-format
msgid ""
"Check this option if you want to run the application with a different user id. "
@@ -604,36 +817,36 @@ msgid ""
msgstr ""
"如果您要以不同用户的身份运行该程序,打开该选项。每个进程都有关联的用户 ID,该 ID 决定了文件和其它访问的权限。该选项需要输入指定的用户的密码。"
-#. i18n: file minicli_ui.ui line 470
-#: rc.cpp:71
+#. i18n: file minicli_ui.ui line 506
+#: rc.cpp:92
#, no-c-format
msgid "Com&mand:"
msgstr "命令(&M):"
-#. i18n: file minicli_ui.ui line 476
-#: rc.cpp:74 rc.cpp:77
-#, no-c-format
+#. i18n: file minicli_ui.ui line 512
+#: rc.cpp:95 rc.cpp:98
+#, fuzzy, no-c-format
msgid ""
"Enter the command you wish to execute or the address of the resource you want "
-"to open. This can be a remote URL like \"www.kde.org\" or a local one like "
-"\"~/.tderc\"."
+"to open. This can be a remote URL like \"www.trinitydesktop.org\" or a local "
+"one like \"~/.tderc\"."
msgstr "输入您要执行的命令或您要打开的资源的地址。这可以是一个远程 URL,如“www.kde.org”,或本地 URL,如“~/.tderc”。"
-#. i18n: file minicli_ui.ui line 533
-#: rc.cpp:80
+#. i18n: file minicli_ui.ui line 569
+#: rc.cpp:101
#, no-c-format
msgid ""
"Enter the name of the application you want to run or the URL you want to view"
msgstr "输入您要运行的程序的名称或您要查看的 URL"
#. i18n: file kdesktop.kcfg line 11
-#: rc.cpp:83
+#: rc.cpp:104
#, no-c-format
msgid "Common settings for all desktops"
msgstr "全部桌面的公共设置"
#. i18n: file kdesktop.kcfg line 12
-#: rc.cpp:86
+#: rc.cpp:107
#, no-c-format
msgid ""
"If you want the same background settings to be applied to all desktops enable "
@@ -641,13 +854,13 @@ msgid ""
msgstr "如果您想要对全部桌面都应用相同的背景设置,请启用此选项。"
#. i18n: file kdesktop.kcfg line 16
-#: rc.cpp:89
+#: rc.cpp:110
#, no-c-format
msgid "Common settings for all screens"
msgstr "全部屏幕使用公共设置"
#. i18n: file kdesktop.kcfg line 17
-#: rc.cpp:92
+#: rc.cpp:113
#, no-c-format
msgid ""
"If you want the same background settings to be applied to all screens enable "
@@ -655,13 +868,13 @@ msgid ""
msgstr "如果您想要对全部屏幕都应用相同的背景设置,请启用此选项。"
#. i18n: file kdesktop.kcfg line 21
-#: rc.cpp:95
+#: rc.cpp:116
#, no-c-format
msgid "Draw backgrounds per screen"
msgstr "每个屏幕独立绘制背景"
#. i18n: file kdesktop.kcfg line 22
-#: rc.cpp:98
+#: rc.cpp:119
#, no-c-format
msgid ""
"If you want to draw to each screen separately in xinerama mode enable this "
@@ -669,26 +882,26 @@ msgid ""
msgstr "如果您想要在 xinerama 模式中独立绘制每个屏幕,请启用此选项。"
#. i18n: file kdesktop.kcfg line 26
-#: rc.cpp:101
+#: rc.cpp:122
#, no-c-format
msgid "Limit background cache"
msgstr "限制背景缓存"
#. i18n: file kdesktop.kcfg line 27
-#: rc.cpp:104
+#: rc.cpp:125
#, no-c-format
msgid ""
"Enable this option if you want to limit the cache size for the background."
msgstr "如果您想要限制背景的缓存大小,请启用此选项。"
#. i18n: file kdesktop.kcfg line 31
-#: rc.cpp:107
+#: rc.cpp:128
#, no-c-format
msgid "Background cache size"
msgstr "背景缓存大小"
#. i18n: file kdesktop.kcfg line 32
-#: rc.cpp:110
+#: rc.cpp:131
#, no-c-format
msgid ""
"Here you can enter how much memory TDE should use for caching the "
@@ -697,14 +910,28 @@ msgid ""
"use."
msgstr "您可以在此选择 TDE 应使用多少内存对背景进行缓存。如果您为不同的桌面设定不同的桌面缓存,切换桌面将会更加平滑,但将以高内存占用为代价。"
-#. i18n: file kdesktop.kcfg line 38
-#: rc.cpp:113
+#. i18n: file kdesktop.kcfg line 36
+#: rc.cpp:134
+#, fuzzy, no-c-format
+msgid "Background Opacity"
+msgstr "背景缓存大小"
+
+#. i18n: file kdesktop.kcfg line 37
+#: rc.cpp:137
+#, no-c-format
+msgid ""
+"Here you can the opacity of the background (0-100). A composite manager can "
+"then render something behind it."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 43
+#: rc.cpp:140
#, no-c-format
msgid "Show icons on desktop"
msgstr "在桌面上显示图标"
-#. i18n: file kdesktop.kcfg line 39
-#: rc.cpp:116
+#. i18n: file kdesktop.kcfg line 44
+#: rc.cpp:143
#, no-c-format
msgid ""
"Uncheck this option if you do not want to have icons on the desktop. Without "
@@ -712,14 +939,14 @@ msgid ""
"drag files to the desktop."
msgstr "如果您不想再桌面上显示桌面,请不要选中此选项。没有图标的桌面可能会快一点,但您也无法将文件拖曳至桌面。"
-#. i18n: file kdesktop.kcfg line 43
-#: rc.cpp:119
+#. i18n: file kdesktop.kcfg line 48
+#: rc.cpp:146
#, no-c-format
msgid "Allow programs in desktop window"
msgstr "允许桌面窗口中的应用程序"
-#. i18n: file kdesktop.kcfg line 44
-#: rc.cpp:122
+#. i18n: file kdesktop.kcfg line 49
+#: rc.cpp:149
#, no-c-format
msgid ""
"Check this option if you want to run X11 programs that draw into the desktop "
@@ -730,132 +957,132 @@ msgstr ""
"如果您想要运行要在桌面上绘图的 X11 程序,比如 xsnow、xpenguim 或 xmountain,请选中此选项。如果您在 Netscape "
"这样需要检查 root 窗口的运行实例的应用程序时遇到了问题,请禁用此选项。"
-#. i18n: file kdesktop.kcfg line 55
-#: rc.cpp:125
+#. i18n: file kdesktop.kcfg line 60
+#: rc.cpp:152
#, no-c-format
msgid "Automatically line up icons"
msgstr "自动排列图标"
-#. i18n: file kdesktop.kcfg line 56
-#: rc.cpp:128
+#. i18n: file kdesktop.kcfg line 61
+#: rc.cpp:155
#, no-c-format
msgid ""
"Check this option if you want to see your icons automatically aligned to the "
"grid when you move them."
msgstr "如果您想要在让您的图标在您移动后自动与网格对齐,请选中此选项。"
-#. i18n: file kdesktop.kcfg line 60
-#: rc.cpp:131 rc.cpp:209
+#. i18n: file kdesktop.kcfg line 65
+#: rc.cpp:158 rc.cpp:236
#, no-c-format
msgid "Sort directories first"
msgstr "目录在前"
-#. i18n: file kdesktop.kcfg line 71
-#: rc.cpp:134
+#. i18n: file kdesktop.kcfg line 76
+#: rc.cpp:161
#, no-c-format
msgid "Mouse wheel over desktop background switches desktop"
msgstr "在桌面背景上滚动鼠标滚轮可切换桌面"
-#. i18n: file kdesktop.kcfg line 72
-#: rc.cpp:137
+#. i18n: file kdesktop.kcfg line 77
+#: rc.cpp:164
#, no-c-format
msgid ""
"You can switch between the virtual desktops by using the mouse wheel over the "
"desktop background."
msgstr "您在桌面背景上使用鼠标滚轮可以在虚拟桌面间切换。"
-#. i18n: file kdesktop.kcfg line 83
-#: rc.cpp:140
+#. i18n: file kdesktop.kcfg line 88
+#: rc.cpp:167
#, no-c-format
msgid "Terminal application"
msgstr "终端应用程序"
-#. i18n: file kdesktop.kcfg line 84
-#: rc.cpp:143
+#. i18n: file kdesktop.kcfg line 89
+#: rc.cpp:170
#, no-c-format
msgid "Defines which terminal application is used."
msgstr "定义所使用的终端应用程序。"
-#. i18n: file kdesktop.kcfg line 88
-#: rc.cpp:146
+#. i18n: file kdesktop.kcfg line 93
+#: rc.cpp:173
#, no-c-format
msgid "Left Mouse Button Action"
msgstr "鼠标左键动作"
-#. i18n: file kdesktop.kcfg line 89
-#: rc.cpp:149
+#. i18n: file kdesktop.kcfg line 94
+#: rc.cpp:176
#, no-c-format
msgid ""
"You can choose what happens when you click the left button of your pointing "
"device on the desktop."
msgstr "您可以选择当您在桌面上单击鼠标左键时执行的操作。"
-#. i18n: file kdesktop.kcfg line 93
-#: rc.cpp:152
+#. i18n: file kdesktop.kcfg line 98
+#: rc.cpp:179
#, no-c-format
msgid "Middle Mouse Button Action"
msgstr "鼠标中键动作"
-#. i18n: file kdesktop.kcfg line 94
-#: rc.cpp:155
+#. i18n: file kdesktop.kcfg line 99
+#: rc.cpp:182
#, no-c-format
msgid ""
"You can choose what happens when you click the middle button of your pointing "
"device on the desktop."
msgstr "您可以选择当您在桌面上单击鼠标中键时执行的操作。"
-#. i18n: file kdesktop.kcfg line 98
-#: rc.cpp:158
+#. i18n: file kdesktop.kcfg line 103
+#: rc.cpp:185
#, no-c-format
msgid "Right Mouse Button Action"
msgstr "鼠标右键动作"
-#. i18n: file kdesktop.kcfg line 99
-#: rc.cpp:161
+#. i18n: file kdesktop.kcfg line 104
+#: rc.cpp:188
#, no-c-format
msgid ""
"You can choose what happens when you click the right button of your pointing "
"device on the desktop."
msgstr "您可以选择当您在桌面上单击鼠标右键时执行的操作。"
-#. i18n: file kdesktop.kcfg line 105
-#: rc.cpp:164
-#, no-c-format
-msgid "TDE major version number"
+#. i18n: file kdesktop.kcfg line 110
+#: rc.cpp:191
+#, fuzzy, no-c-format
+msgid "KDE major version number"
msgstr "TDE 主版本号"
-#. i18n: file kdesktop.kcfg line 110
-#: rc.cpp:167
-#, no-c-format
-msgid "TDE minor version number"
+#. i18n: file kdesktop.kcfg line 115
+#: rc.cpp:194
+#, fuzzy, no-c-format
+msgid "KDE minor version number"
msgstr "TDE 次版本号"
-#. i18n: file kdesktop.kcfg line 115
-#: rc.cpp:170
-#, no-c-format
-msgid "TDE release version number"
+#. i18n: file kdesktop.kcfg line 120
+#: rc.cpp:197
+#, fuzzy, no-c-format
+msgid "KDE release version number"
msgstr "TDE 释放版本号"
-#. i18n: file kdesktop.kcfg line 122
-#: rc.cpp:173
+#. i18n: file kdesktop.kcfg line 127
+#: rc.cpp:200
#, no-c-format
msgid "Normal text color used for icon labels"
msgstr "图标标签的普通文本颜色"
-#. i18n: file kdesktop.kcfg line 126
-#: rc.cpp:176
+#. i18n: file kdesktop.kcfg line 131
+#: rc.cpp:203
#, no-c-format
msgid "Background color used for icon labels"
msgstr "图标标签所用的背景颜色"
-#. i18n: file kdesktop.kcfg line 131
-#: rc.cpp:179
+#. i18n: file kdesktop.kcfg line 136
+#: rc.cpp:206
#, no-c-format
msgid "Enable text shadow"
msgstr "启用文本阴影"
-#. i18n: file kdesktop.kcfg line 132
-#: rc.cpp:182
+#. i18n: file kdesktop.kcfg line 137
+#: rc.cpp:209
#, no-c-format
msgid ""
"Check here to enable a shadow outline around the desktop font. This also "
@@ -863,14 +1090,14 @@ msgid ""
"color."
msgstr "选中此处可启用桌面字体的阴影外框。这也将改进背景与文本颜色相近的文字的可读性。"
-#. i18n: file kdesktop.kcfg line 145
-#: rc.cpp:185
+#. i18n: file kdesktop.kcfg line 150
+#: rc.cpp:212
#, no-c-format
msgid "Show hidden files"
msgstr "显示隐藏文件"
-#. i18n: file kdesktop.kcfg line 146
-#: rc.cpp:188
+#. i18n: file kdesktop.kcfg line 151
+#: rc.cpp:215
#, no-c-format
msgid ""
"<p>If you check this option, any files in your desktop directory that begin "
@@ -885,39 +1112,39 @@ msgstr ""
"<p>例如,名为“.directory”的纯文本文件包含了 Konqueror "
"的信息,比如显示目录时所使用的图标,目录内文件的排序依据等等。您不应该更改或删除这些文件,除非您完全了解这些文件。</p>"
-#. i18n: file kdesktop.kcfg line 150
-#: rc.cpp:191
+#. i18n: file kdesktop.kcfg line 155
+#: rc.cpp:218
#, no-c-format
msgid "Align direction"
msgstr "排列方向"
-#. i18n: file kdesktop.kcfg line 151
-#: rc.cpp:194
+#. i18n: file kdesktop.kcfg line 156
+#: rc.cpp:221
#, no-c-format
msgid ""
"If this is enabled, icons are aligned vertically, otherwise horizontally."
msgstr "如果启用了此选项,图标将会以垂直方式排列,否则将以水平方式排列。"
-#. i18n: file kdesktop.kcfg line 155
-#: rc.cpp:197
+#. i18n: file kdesktop.kcfg line 160
+#: rc.cpp:224
#, no-c-format
msgid "Show Icon Previews For"
msgstr "显示预览的文件类型"
-#. i18n: file kdesktop.kcfg line 156
-#: rc.cpp:200
+#. i18n: file kdesktop.kcfg line 161
+#: rc.cpp:227
#, no-c-format
msgid "Select for which types of files you want to enable preview images."
msgstr "选择您想要启用预览的图像文件类型。"
-#. i18n: file kdesktop.kcfg line 170
-#: rc.cpp:203
+#. i18n: file kdesktop.kcfg line 175
+#: rc.cpp:230
#, no-c-format
msgid "Sort criterion"
msgstr "排序依据"
-#. i18n: file kdesktop.kcfg line 171
-#: rc.cpp:206
+#. i18n: file kdesktop.kcfg line 176
+#: rc.cpp:233
#, no-c-format
msgid ""
"Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
@@ -926,40 +1153,40 @@ msgstr ""
"选择排序依据。可供选择的选项有:NameCaseSensitive = 0,NameCaseInsensitive = 1,Size = 2,Type = "
"3,Date = 4。"
-#. i18n: file kdesktop.kcfg line 176
-#: rc.cpp:212
+#. i18n: file kdesktop.kcfg line 181
+#: rc.cpp:239
#, no-c-format
msgid ""
"Enable this to place directories in front of the sorted list, otherwise they "
"are amongst the files."
msgstr "启用此选项可将目录放在排序后列表的最前面,否则将与文件放在一起排序。"
-#. i18n: file kdesktop.kcfg line 181
-#: rc.cpp:218
+#. i18n: file kdesktop.kcfg line 186
+#: rc.cpp:245
#, no-c-format
msgid "Check this option if you want to keep your icons from moving."
msgstr "如果您想要避免图标被移动,请选中此选项。"
-#. i18n: file kdesktop.kcfg line 202
-#: rc.cpp:221
+#. i18n: file kdesktop.kcfg line 207
+#: rc.cpp:248
#, no-c-format
msgid "Device Types to exclude"
msgstr "要排除的设备类型"
-#. i18n: file kdesktop.kcfg line 203
-#: rc.cpp:224
+#. i18n: file kdesktop.kcfg line 208
+#: rc.cpp:251
#, no-c-format
msgid "The device types which you do not want to see on the desktop."
msgstr "您不想在桌面上看到的设备类型。"
-#. i18n: file kdesktop.kcfg line 211
-#: rc.cpp:227
+#. i18n: file kdesktop.kcfg line 221
+#: rc.cpp:254
#, no-c-format
msgid "Current application's menu bar (Mac OS-style)"
msgstr "当前应用程序的菜单栏(Mac OS 样式)"
-#. i18n: file kdesktop.kcfg line 212
-#: rc.cpp:230
+#. i18n: file kdesktop.kcfg line 222
+#: rc.cpp:257
#, no-c-format
msgid ""
"If this option is selected, applications will not have their menu bar attached "
@@ -969,52 +1196,52 @@ msgid ""
msgstr ""
"如果选中了此选项,应用程序的菜单栏将不会显示在其自己的窗口中。而屏幕上方会出现一个显示目前激活的应用程序的菜单。您可能会在 Mac OS 中看到过此特性。"
-#. i18n: file kdesktop.kcfg line 218
-#: rc.cpp:233
+#. i18n: file kdesktop.kcfg line 228
+#: rc.cpp:260
#, no-c-format
msgid "Desktop menu bar"
msgstr "桌面菜单栏"
-#. i18n: file kdesktop.kcfg line 219
-#: rc.cpp:236
+#. i18n: file kdesktop.kcfg line 229
+#: rc.cpp:263
#, no-c-format
msgid ""
"If this option is selected, there is one menu bar at the top of the screen "
"which shows the desktop menus."
msgstr "如果选中了此选项,则会在屏幕最上方显示一个包含桌面菜单的菜单栏。"
-#. i18n: file kdesktop.kcfg line 225
-#: rc.cpp:239
+#. i18n: file kdesktop.kcfg line 235
+#: rc.cpp:266
#, no-c-format
msgid "Enable screen saver"
msgstr "启用屏幕保护程序"
-#. i18n: file kdesktop.kcfg line 226
-#: rc.cpp:242
+#. i18n: file kdesktop.kcfg line 236
+#: rc.cpp:269
#, no-c-format
msgid "Enables the screen saver."
msgstr "启用屏幕保护程序。"
-#. i18n: file kdesktop.kcfg line 230
-#: rc.cpp:245
+#. i18n: file kdesktop.kcfg line 240
+#: rc.cpp:272
#, no-c-format
msgid "Screen saver timeout"
msgstr "屏幕保护程序超时"
-#. i18n: file kdesktop.kcfg line 231
-#: rc.cpp:248
+#. i18n: file kdesktop.kcfg line 241
+#: rc.cpp:275
#, no-c-format
msgid "Sets the seconds after which the screen saver is started."
msgstr "设定屏幕保护程序启动前等待的秒数。"
-#. i18n: file kdesktop.kcfg line 235
-#: rc.cpp:251
+#. i18n: file kdesktop.kcfg line 245
+#: rc.cpp:278
#, no-c-format
msgid "Suspend screen saver when DPMS kicks in"
msgstr ""
-#. i18n: file kdesktop.kcfg line 238
-#: rc.cpp:254
+#. i18n: file kdesktop.kcfg line 248
+#: rc.cpp:281
#, no-c-format
msgid ""
"Usually the screen saver is suspended when display power saving kicks in,\n"
@@ -1024,6 +1251,52 @@ msgid ""
"them."
msgstr ""
+#. i18n: file kdesktop.kcfg line 303
+#: rc.cpp:286
+#, no-c-format
+msgid ""
+"When enabled this restores the old style unmanaged window behavior of desktop "
+"locking."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 308
+#: rc.cpp:289
+#, no-c-format
+msgid ""
+"When enabled the date and time when the desktop was locked is displayed as an "
+"additional intrusion detection measure."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 313
+#: rc.cpp:292
+#, no-c-format
+msgid ""
+"When disabled the screensaver starts immediately when locking the desktop."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 318
+#: rc.cpp:295
+#, no-c-format
+msgid ""
+"When enabled all active windows are hidden from the screensaver, showing only "
+"the desktop background as a result."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 323
+#: rc.cpp:298
+#, no-c-format
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 328
+#: rc.cpp:301
+#, no-c-format
+msgid ""
+"When enabled, the Trinity Secure Attention Key (TSAK) system will be used to "
+"secure the screen locker. This requires system wide TSAK support to be enabled "
+"prior to use."
+msgstr ""
+
#~ msgid "Disable screen saver during presentation or TV"
#~ msgstr "展示或看电视时禁止屏幕保护程序"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdialog.po b/tde-i18n-zh_CN/messages/tdebase/kdialog.po
index a4dd28d1a4c..6d53c26104b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdialog.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdialog.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kdialog\n"
-"POT-Creation-Date: 2006-04-27 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:27+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -157,15 +158,15 @@ msgstr "保存“不再显示/再次询问”状态的配置文件和选项名
msgid "Arguments - depending on main option"
msgstr "参数 - 根据主选项"
-#: kdialog.cpp:665
+#: kdialog.cpp:679
msgid "KDialog"
msgstr "KDialog"
-#: kdialog.cpp:666
+#: kdialog.cpp:680
msgid "KDialog can be used to show nice dialog boxes from shell scripts"
msgstr "KDialog 可用于在 shell 脚本中显示友好的对话框"
-#: kdialog.cpp:669
+#: kdialog.cpp:683
msgid "Current maintainer"
msgstr "当前维护者"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kfindpart.po b/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
index b17259e822b..137f1013cca 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
@@ -9,10 +9,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2006-10-10 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:58+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -350,7 +351,8 @@ msgstr ""
"<li><b>图片 (png...)</b>只查找分辨率,位宽度...</li></ul></qt>"
#: kftabdlg.cpp:552
-msgid "Unable to search within a period which is less than a minute."
+#, fuzzy
+msgid "Unable to search within a period that is less than a minute."
msgstr "不能查找小于1分钟的时间间隔。"
#: kftabdlg.cpp:563
@@ -460,7 +462,7 @@ msgstr "打开方式..."
msgid "Selected Files"
msgstr "选中的文件"
-#: kquery.cpp:478
+#: kquery.cpp:483
msgid "Error while using locate"
msgstr "使用 locate 出错"
@@ -477,7 +479,8 @@ msgid "KFind"
msgstr "KFind"
#: main.cpp:27
-msgid "(c) 1998-2003, The TDE Developers"
+#, fuzzy
+msgid "(c) 1998-2003, The KDE Developers"
msgstr "(c) 1998-2003, TDE开发人员"
#: main.cpp:29
diff --git a/tde-i18n-zh_CN/messages/tdebase/kfmclient.po b/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
index a1d8c9f33bb..3caebee502c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kfmclient\n"
-"POT-Creation-Date: 2006-08-04 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-06 11:19+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -190,6 +191,16 @@ msgstr ""
"\n"
#: kfmclient.cc:127
+#, fuzzy
+msgid ""
+" kfmclient openBrowser\n"
+" # Opens the system default Web browser.\n"
+"\n"
+msgstr ""
+" kfmclient openProperties 'url'\n"
+" # 打开属性菜单\n"
+
+#: kfmclient.cc:129
msgid ""
" kfmclient configure\n"
" # Re-read Konqueror's configuration.\n"
@@ -199,7 +210,7 @@ msgstr ""
" # 重新读 Konqueror 的配置文件。\n"
"\n"
-#: kfmclient.cc:129
+#: kfmclient.cc:131
msgid ""
" kfmclient configureDesktop\n"
" # Re-read kdesktop's configuration.\n"
@@ -209,7 +220,7 @@ msgstr ""
" # 重新读 kdesktop 的配置文件。\n"
"\n"
-#: kfmclient.cc:132
+#: kfmclient.cc:134
msgid ""
"*** Examples:\n"
" kfmclient exec file:/root/Desktop/cdrom.desktop \"Mount default\"\n"
@@ -221,7 +232,7 @@ msgstr ""
" // 安装 CDROM\n"
"\n"
-#: kfmclient.cc:135
+#: kfmclient.cc:137
msgid ""
" kfmclient exec file:/home/weis/data/test.html\n"
" // Opens the file with default binding\n"
@@ -231,7 +242,7 @@ msgstr ""
" // 使用默认关联打开文件\n"
"\n"
-#: kfmclient.cc:137
+#: kfmclient.cc:139
msgid ""
" kfmclient exec file:/home/weis/data/test.html Netscape\n"
" // Opens the file with netscape\n"
@@ -241,7 +252,7 @@ msgstr ""
" // 用 netscape 打开文件\n"
"\n"
-#: kfmclient.cc:139
+#: kfmclient.cc:141
msgid ""
" kfmclient exec ftp://localhost/\n"
" // Opens new window with URL\n"
@@ -251,7 +262,7 @@ msgstr ""
" // 在新窗口中打开 URL\n"
"\n"
-#: kfmclient.cc:141
+#: kfmclient.cc:143
msgid ""
" kfmclient exec file:/root/Desktop/emacs.desktop\n"
" // Starts emacs\n"
@@ -261,7 +272,7 @@ msgstr ""
" // 启动 emacs\n"
"\n"
-#: kfmclient.cc:143
+#: kfmclient.cc:145
msgid ""
" kfmclient exec file:/root/Desktop/cdrom.desktop\n"
" // Opens the CD-ROM's mount directory\n"
@@ -271,7 +282,7 @@ msgstr ""
" // 打开 CD-ROM 安装的目录\n"
"\n"
-#: kfmclient.cc:145
+#: kfmclient.cc:147
msgid ""
" kfmclient exec .\n"
" // Opens the current directory. Very convenient.\n"
@@ -281,29 +292,29 @@ msgstr ""
" // 打开当前目录。非常方便。\n"
"\n"
-#: kfmclient.cc:405
+#: kfmclient.cc:407
msgid ""
"Profile %1 not found\n"
msgstr ""
"没有找到设置 %1\n"
-#: kfmclient.cc:434
+#: kfmclient.cc:436
msgid ""
"Syntax Error: Not enough arguments\n"
msgstr ""
"语法错误:参数不足\n"
-#: kfmclient.cc:439
+#: kfmclient.cc:441
msgid ""
"Syntax Error: Too many arguments\n"
msgstr ""
"语法错误:参数过多\n"
-#: kfmclient.cc:559
+#: kfmclient.cc:569
msgid "Unable to download from an invalid URL."
msgstr "无法从一个无效的 URL 下载。"
-#: kfmclient.cc:623
+#: kfmclient.cc:633
msgid ""
"Syntax Error: Unknown command '%1'\n"
msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
index 8b508e28030..30a48f17313 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
@@ -1,42 +1,43 @@
msgid ""
msgstr ""
"Project-Id-Version: kgreet_classic\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-05-03 13:27+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kgreet_classic.cpp:97
+#: kgreet_classic.cpp:98
msgid "&Username:"
msgstr "用户名(&U):"
-#: kgreet_classic.cpp:102
+#: kgreet_classic.cpp:103
msgid "Username:"
msgstr "用户名:"
-#: kgreet_classic.cpp:124
+#: kgreet_classic.cpp:125
msgid "&Password:"
msgstr "密码(&P):"
-#: kgreet_classic.cpp:125
+#: kgreet_classic.cpp:126
msgid "Current &password:"
msgstr "当前密码(&P):"
-#: kgreet_classic.cpp:143
+#: kgreet_classic.cpp:144
msgid "&New password:"
msgstr "新密码(&N):"
-#: kgreet_classic.cpp:144
+#: kgreet_classic.cpp:145
msgid "Con&firm password:"
msgstr "确认密码(&F):"
-#: kgreet_classic.cpp:291
+#: kgreet_classic.cpp:299
msgid "Unrecognized prompt \"%1\""
msgstr "无法识别的提示“%1”"
-#: kgreet_classic.cpp:500
+#: kgreet_classic.cpp:508
msgid "Username + password (classic)"
msgstr "用户名+密码(经典)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po b/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
index 53dc49fa106..db0a4e1914d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
@@ -4,50 +4,51 @@
msgid ""
msgstr ""
"Project-Id-Version: kgreet_winbind\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-14 05:41+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kgreet_winbind.cpp:127
+#: kgreet_winbind.cpp:128
msgid "&Domain:"
msgstr "域(&D):"
-#: kgreet_winbind.cpp:128
+#: kgreet_winbind.cpp:129
msgid "&Username:"
msgstr "用户名(&U):"
-#: kgreet_winbind.cpp:142
+#: kgreet_winbind.cpp:143
msgid "Domain:"
msgstr "域:"
-#: kgreet_winbind.cpp:145
+#: kgreet_winbind.cpp:146
msgid "Username:"
msgstr "用户名:"
-#: kgreet_winbind.cpp:164
+#: kgreet_winbind.cpp:165
msgid "&Password:"
msgstr "密码(&P):"
-#: kgreet_winbind.cpp:165
+#: kgreet_winbind.cpp:166
msgid "Current &password:"
msgstr "当前密码(&P):"
-#: kgreet_winbind.cpp:188
+#: kgreet_winbind.cpp:189
msgid "&New password:"
msgstr "新密码(&N):"
-#: kgreet_winbind.cpp:189
+#: kgreet_winbind.cpp:190
msgid "Con&firm password:"
msgstr "确认密码(&F):"
-#: kgreet_winbind.cpp:370
+#: kgreet_winbind.cpp:378
msgid "Unrecognized prompt \"%1\""
msgstr "无法识别提示“%1”"
-#: kgreet_winbind.cpp:666
+#: kgreet_winbind.cpp:674
msgid "Winbind / Samba"
msgstr "Winbind / Samba"
diff --git a/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po b/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
index 797157ccd7d..555c6b6fb21 100644
--- a/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
+++ b/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: khelpcenter\n"
-"POT-Creation-Date: 2007-05-19 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-02-12 17:24+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -31,23 +32,25 @@ msgstr "lark@linux.net.cn"
msgid "URL to display"
msgstr "要显示的 URL"
-#: application.cpp:63 navigator.cpp:466
-msgid "TDE Help Center"
+#: application.cpp:63
+#, fuzzy
+msgid "Trinity Help Center"
msgstr "TDE 帮助中心"
-#: application.cpp:65 khc_indexbuilder.cpp:176
-msgid "The TDE Help Center"
-msgstr "TDE 帮助中心"
+#: application.cpp:65 navigator.cpp:473
+#, fuzzy
+msgid "The Trinity Help Center"
+msgstr "TDE 控制中心"
#: application.cpp:67
msgid "(c) 1999-2003, The KHelpCenter developers"
msgstr "(C) 1999-2003,KHelpCenter 开发者"
-#: application.cpp:71
+#: application.cpp:72
msgid "Original Author"
msgstr "原始作者"
-#: application.cpp:73
+#: application.cpp:74
msgid "Info page support"
msgstr "信息页支持"
@@ -147,7 +150,8 @@ msgid "See also: "
msgstr "另见:"
#: glossary.cpp:292
-msgid "TDE Glossary"
+#, fuzzy
+msgid "KDE Glossary"
msgstr "TDE 术语表"
#: htmlsearchconfig.cpp:44
@@ -267,33 +271,33 @@ msgstr "更改..."
msgid "<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>"
msgstr "<qt>文件夹 <b>%1</b>不存在;无法创建索引。</qt>"
-#: kcmhelpcenter.cpp:352
+#: kcmhelpcenter.cpp:353
msgid "Missing"
msgstr "缺少"
-#: kcmhelpcenter.cpp:397
+#: kcmhelpcenter.cpp:398
msgid ""
"Document '%1' (%2):\n"
msgstr ""
"文档“%1”(%2):\n"
-#: kcmhelpcenter.cpp:402
+#: kcmhelpcenter.cpp:403
msgid "No document type."
msgstr "无文档类型。"
-#: kcmhelpcenter.cpp:408
+#: kcmhelpcenter.cpp:409
msgid "No search handler available for document type '%1'."
msgstr "没有文档类型“%1”可用的搜索处理程序。"
-#: kcmhelpcenter.cpp:415
+#: kcmhelpcenter.cpp:416
msgid "No indexing command specified for document type '%1'."
msgstr "没有文档类型“%1”可用的索引命令。"
-#: kcmhelpcenter.cpp:530
+#: kcmhelpcenter.cpp:531
msgid "Failed to build index."
msgstr "建立索引失败。"
-#: kcmhelpcenter.cpp:588
+#: kcmhelpcenter.cpp:589
#, c-format
msgid ""
"Error executing indexing build command:\n"
@@ -318,6 +322,10 @@ msgstr "索引目录"
msgid "KHelpCenter Index Builder"
msgstr "KHelpCenter 索引创建工具"
+#: khc_indexbuilder.cpp:176
+msgid "The TDE Help Center"
+msgstr "TDE 帮助中心"
+
#: khc_indexbuilder.cpp:178
msgid "(c) 2003, The KHelpCenter developers"
msgstr "(C) 2003,KHelpCenter 开发者"
@@ -394,31 +402,31 @@ msgstr "清除搜索"
msgid "&Search"
msgstr "搜索(&S)"
-#: navigator.cpp:187
+#: navigator.cpp:188
msgid "Search Options"
msgstr "搜索选项"
-#: navigator.cpp:195
+#: navigator.cpp:196
msgid "G&lossary"
msgstr "术语表(&L)"
-#: navigator.cpp:465
+#: navigator.cpp:472
msgid "Start Page"
msgstr "起始页"
-#: navigator.cpp:553
+#: navigator.cpp:560
msgid "Unable to run search program."
msgstr "无法运行搜索程序。"
-#: navigator.cpp:594
+#: navigator.cpp:601
msgid "A search index does not yet exist. Do you want to create the index now?"
msgstr "搜索索引不存在。您要现在创建吗?"
-#: navigator.cpp:598
+#: navigator.cpp:605
msgid "Create"
msgstr "创建"
-#: navigator.cpp:599
+#: navigator.cpp:606
msgid "Do Not Create"
msgstr "不创建"
@@ -536,76 +544,84 @@ msgid "Help Center"
msgstr "帮助中心"
#: view.cpp:120
-msgid "Welcome to the K Desktop Environment"
+#, fuzzy
+msgid "Welcome to the Trinity Desktop Environment"
msgstr "欢迎使用 K 桌面环境"
#: view.cpp:121
-msgid "The TDE team welcomes you to user-friendly UNIX computing"
+#, fuzzy
+msgid "The TDE team welcomes you to user-friendly UNIX-like computing"
msgstr "TDE 团队欢迎您使用易用的 UNIX 计算环境"
#: view.cpp:122
+#, fuzzy
msgid ""
-"TDE is a powerful graphical desktop environment for UNIX workstations. A\n"
-"TDE desktop combines ease of use, contemporary functionality and outstanding\n"
-"graphical design with the technological superiority of the UNIX operating\n"
-"system."
+"The Trinity Desktop Environment (TDE) is a graphical desktop\n"
+"environment for UNIX-like workstations. The\n"
+"Trinity Desktop Environment combines ease of use, contemporary functionality, "
+"and\n"
+"professional graphical design along with the technical advantages of\n"
+"UNIX-like operating systems."
msgstr ""
"TDE 是一个 UNIX 工作站上的功能强大的图形桌面环境。\n"
"TDE 桌面结合了易用、通用的功能和杰出的图形设计,\n"
"以及 UNIX 操作系统的技术优势。"
-#: view.cpp:126
-msgid "What is the K Desktop Environment?"
+#: view.cpp:127
+#, fuzzy
+msgid "What is the Trinity Desktop Environment?"
msgstr "K 桌面环境是什么?"
-#: view.cpp:127
-msgid "Contacting the TDE Project"
+#: view.cpp:128
+#, fuzzy
+msgid "Contacting the TDE Project Members"
msgstr "联系 TDE 计划"
-#: view.cpp:128
+#: view.cpp:129
msgid "Supporting the TDE Project"
msgstr "支持 TDE 计划"
-#: view.cpp:129
+#: view.cpp:130
msgid "Useful links"
msgstr "有用的链接"
-#: view.cpp:130
+#: view.cpp:131
msgid "Getting the most out of TDE"
msgstr "充分利用 TDE"
-#: view.cpp:131
+#: view.cpp:132
msgid "General Documentation"
msgstr "常规文档"
-#: view.cpp:132
+#: view.cpp:133
msgid "A Quick Start Guide to the Desktop"
msgstr "桌面快速指南"
-#: view.cpp:133
+#: view.cpp:134
msgid "TDE Users' guide"
msgstr "TDE 用户手册"
-#: view.cpp:134
-msgid "Frequently asked questions"
+#: view.cpp:135
+#, fuzzy
+msgid "Frequently Asked Questions"
msgstr "常见问题解答"
-#: view.cpp:135
+#: view.cpp:136
msgid "Basic Applications"
msgstr "基本应用程序"
-#: view.cpp:136
+#: view.cpp:137
msgid "The Kicker Desktop Panel"
msgstr "Kicker 桌面面板"
-#: view.cpp:137
+#: view.cpp:138
msgid "The Trinity Control Center"
msgstr "TDE 控制中心"
-#: view.cpp:138
+#: view.cpp:139
msgid "The Konqueror File manager and Web Browser"
msgstr "Konqueror 文件管理器和 Web 浏览器"
-#: view.cpp:269
+#: view.cpp:270
msgid "Copy Link Address"
msgstr "复制链接地址"
diff --git a/tde-i18n-zh_CN/messages/tdebase/khotkeys.po b/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
index 7cf891c5bae..346c947a267 100644
--- a/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
+++ b/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: khotkeys\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:27+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -468,23 +469,43 @@ msgstr "KHotKeys"
msgid "KHotKeys daemon"
msgstr "KHotKeys 守护程序"
-#: shared/actions.cpp:181
+#: shared/actions.cpp:159 shared/actions.cpp:173 shared/actions.cpp:178
+msgid "KHotKeys was unable to execute"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Please verify existence of the service"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Unable to launch service!"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Please verify existence and permissions of the executable file"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Unable to launch program"
+msgstr ""
+
+#: shared/actions.cpp:186
msgid "Command/URL : "
msgstr "命令/URL:"
-#: shared/actions.cpp:218
+#: shared/actions.cpp:223
msgid "Menuentry : "
msgstr "菜单项:"
-#: shared/actions.cpp:302
+#: shared/actions.cpp:307
msgid "DCOP : "
msgstr "DCOP:"
-#: shared/actions.cpp:396
+#: shared/actions.cpp:401
msgid "Keyboard input : "
msgstr "键盘输入:"
-#: shared/actions.cpp:442
+#: shared/actions.cpp:447
msgid "Activate window : "
msgstr "活动的窗口:"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kicker.po b/tde-i18n-zh_CN/messages/tdebase/kicker.po
index b5f860e837c..4eee0c4221a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kicker.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-21 17:13+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,11 @@ msgstr "显示桌面"
msgid "Desktop Access"
msgstr "桌面访问"
-#: buttons/kbutton.cpp:43
+#: buttons/kbutton.cpp:45
msgid "Applications, tasks and desktop sessions"
msgstr "应用程序、任务和桌面会话"
-#: buttons/kbutton.cpp:44 ui/k_mnu.cpp:76
+#: buttons/kbutton.cpp:46 buttons/knewbutton.cpp:59 ui/k_mnu.cpp:87
msgid "TDE Menu"
msgstr "K 菜单"
@@ -46,7 +47,8 @@ msgstr "无法执行非 TDE 应用程序。"
msgid "Kicker Error"
msgstr "Kicker 错误"
-#: buttons/servicemenubutton.cpp:62
+#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1404
+#: ui/k_new_mnu.cpp:1902
msgid "Applications"
msgstr "应用程序"
@@ -78,21 +80,21 @@ msgstr "小程序 %1 无法装入。请检查您的安装。"
msgid "Applet Loading Error"
msgstr "小程序装入错误"
-#: core/container_extension.cpp:1607 core/container_extension.cpp:1620
+#: core/container_extension.cpp:1688 core/container_extension.cpp:1701
msgid "Show panel"
msgstr "显示面板"
-#: core/container_extension.cpp:1611 core/container_extension.cpp:1624
+#: core/container_extension.cpp:1692 core/container_extension.cpp:1705
msgid "Hide panel"
msgstr "隐藏面板"
-#: core/extensionmanager.cpp:117
+#: core/extensionmanager.cpp:120
msgid ""
"The TDE panel (kicker) could not load the main panel due to a problem with your "
"installation. "
msgstr "TDE 面板(kicker)无法装入主面板,原因是您的安装有问题。"
-#: core/extensionmanager.cpp:119
+#: core/extensionmanager.cpp:122
msgid "Fatal Error!"
msgstr "严重错误!"
@@ -117,129 +119,142 @@ msgid "TDE Panel"
msgstr "TDE 面板"
#: core/main.cpp:112
-msgid "(c) 1999-2004, The TDE Team"
+#, fuzzy
+msgid "(c) 1999-2010, The KDE Team"
msgstr "(c) 1999-2004,TDE 团队"
#: core/main.cpp:114
msgid "Current maintainer"
msgstr "当前维护者"
-#: core/main.cpp:122
+#: core/main.cpp:123
msgid "Kiosk mode"
msgstr "Kiosk 模式"
-#: core/panelextension.cpp:341
+#: core/panelextension.cpp:340
msgid "Add &Applet to Menubar..."
msgstr "将小程序添加到菜单栏(&A)..."
-#: core/panelextension.cpp:342
+#: core/panelextension.cpp:341
msgid "Add &Applet to Panel..."
msgstr "将小程序添加到面板(&A)..."
-#: core/panelextension.cpp:345
+#: core/panelextension.cpp:344
msgid "Add Appli&cation to Menubar"
msgstr "将应用程序添加到菜单栏(&C)"
-#: core/panelextension.cpp:346
+#: core/panelextension.cpp:345
msgid "Add Appli&cation to Panel"
msgstr "将应用程序添加到面板(&C)"
-#: core/panelextension.cpp:350
+#: core/panelextension.cpp:349
msgid "&Remove From Menubar"
msgstr "从菜单栏删除(&R)"
-#: core/panelextension.cpp:351
+#: core/panelextension.cpp:350
msgid "&Remove From Panel"
msgstr "从面板删除(&R)"
-#: core/panelextension.cpp:356
+#: core/panelextension.cpp:355
msgid "Add New &Panel"
msgstr "添加新面板(&P)"
-#: core/panelextension.cpp:358
+#: core/panelextension.cpp:357
msgid "Remove Pa&nel"
msgstr "删除面板(&N)"
-#: core/panelextension.cpp:365 core/panelextension.cpp:373
+#: core/panelextension.cpp:364 core/panelextension.cpp:372
msgid "&Lock Panels"
msgstr "锁定面板(&L)"
-#: core/panelextension.cpp:372
+#: core/panelextension.cpp:371
msgid "Un&lock Panels"
msgstr "解锁面板(&L)"
-#: core/panelextension.cpp:380
+#: core/panelextension.cpp:379
msgid "&Configure Panel..."
msgstr "配置面板(&C)..."
+#: core/panelextension.cpp:385
+msgid "&Launch Process Manager..."
+msgstr ""
+
#: ui/addapplet.cpp:234
msgid "Add Applet"
msgstr "添加小程序"
-#: ui/addappletvisualfeedback.cpp:60
+#: ui/addappletvisualfeedback.cpp:61
msgid "%1 Added"
msgstr "添加了 %1"
-#: ui/appletop_mnu.cpp:51
+#: ui/appletop_mnu.cpp:52
msgid "&Move %1 Menu"
msgstr "移动%1菜单(&M)"
-#: ui/appletop_mnu.cpp:52
+#: ui/appletop_mnu.cpp:53
msgid "&Move %1 Button"
msgstr "移动%1按钮(&M)"
-#: ui/appletop_mnu.cpp:53
+#: ui/appletop_mnu.cpp:54
#, c-format
msgid "&Move %1"
msgstr "移动%1(&M)"
-#: ui/appletop_mnu.cpp:75
+#: ui/appletop_mnu.cpp:76
msgid "&Remove %1 Menu"
msgstr "删除%1菜单(&R)"
-#: ui/appletop_mnu.cpp:76
+#: ui/appletop_mnu.cpp:77
msgid "&Remove %1 Button"
msgstr "删除%1按钮(&R)"
-#: ui/appletop_mnu.cpp:77
+#: ui/appletop_mnu.cpp:78
#, c-format
msgid "&Remove %1"
msgstr "删除%1(&R)"
-#: ui/appletop_mnu.cpp:91 ui/extensionop_mnu.cpp:43
+#: ui/appletop_mnu.cpp:92 ui/extensionop_mnu.cpp:43
msgid "Report &Bug..."
msgstr "报告错误(&B)..."
-#: ui/appletop_mnu.cpp:105
+#: ui/appletop_mnu.cpp:106
#, c-format
msgid "&About %1"
msgstr "关于 %1(&A)"
-#: ui/appletop_mnu.cpp:125
+#: ui/appletop_mnu.cpp:126
msgid "&Configure %1 Button..."
msgstr "配置 %1 按钮(&C)..."
-#: ui/appletop_mnu.cpp:130 ui/extensionop_mnu.cpp:62
+#: ui/appletop_mnu.cpp:131 ui/extensionop_mnu.cpp:62
msgid "&Configure %1..."
msgstr "配置 %1(&C)..."
-#: ui/appletop_mnu.cpp:143
+#: ui/appletop_mnu.cpp:144
msgid "Applet Menu"
msgstr "小程序菜单"
-#: ui/appletop_mnu.cpp:144
+#: ui/appletop_mnu.cpp:145
msgid "%1 Menu"
msgstr "%1菜单"
-#: ui/appletop_mnu.cpp:170
+#: ui/appletop_mnu.cpp:173
+msgid "Switch to Kickoff Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:175
+msgid "Switch to Trinity Classic Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:186
msgid "&Menu Editor"
msgstr "菜单编辑器(&M)"
-#: ui/appletop_mnu.cpp:185
+#: ui/appletop_mnu.cpp:201
msgid "&Edit Bookmarks"
msgstr "编辑书签(&E)"
-#: ui/appletop_mnu.cpp:194
+#: ui/appletop_mnu.cpp:210
msgid "Panel Menu"
msgstr "面板菜单"
@@ -267,23 +282,23 @@ msgstr "选择文件夹"
msgid "'%1' is not a valid folder."
msgstr "“%1”不是有效的文件夹。"
-#: ui/browser_mnu.cpp:126 ui/browser_mnu.cpp:135
+#: ui/browser_mnu.cpp:127 ui/browser_mnu.cpp:136
msgid "Failed to Read Folder"
msgstr "读取文件夹失败"
-#: ui/browser_mnu.cpp:143
+#: ui/browser_mnu.cpp:144
msgid "Not Authorized to Read Folder"
msgstr "未授权读取文件夹"
-#: ui/browser_mnu.cpp:151
+#: ui/browser_mnu.cpp:154
msgid "Open in File Manager"
msgstr "在文件管理器中打开"
-#: ui/browser_mnu.cpp:153
+#: ui/browser_mnu.cpp:156
msgid "Open in Terminal"
msgstr "在终端中打开"
-#: ui/browser_mnu.cpp:299
+#: ui/browser_mnu.cpp:302
msgid "More"
msgstr "更多"
@@ -315,47 +330,73 @@ msgstr "不可执行"
msgid "Select Other"
msgstr "选择其它"
-#: ui/k_mnu.cpp:197
+#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1029
+#, fuzzy
+msgid "New Applications"
+msgstr "应用程序"
+
+#: ui/itemview.cpp:479
+msgid "Restart Computer"
+msgstr ""
+
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:378 ui/k_new_mnu.cpp:1356
+msgid "Switch User"
+msgstr "切换用户"
+
+#: ui/itemview.cpp:860
+#, fuzzy, c-format
+msgid "Host: %1"
+msgstr "浏览:%1"
+
+#: ui/itemview.cpp:1170
+msgid "Directory: /)"
+msgstr ""
+
+#: ui/itemview.cpp:1172
+msgid "Directory: "
+msgstr ""
+
+#: ui/k_mnu.cpp:267
+msgid "Press '/' to search..."
+msgstr ""
+
+#: ui/k_mnu.cpp:286
msgid "All Applications"
msgstr "全部应用程序"
-#: ui/k_mnu.cpp:199
+#: ui/k_mnu.cpp:288
msgid "Actions"
msgstr "动作"
-#: ui/k_mnu.cpp:231
+#: ui/k_mnu.cpp:320
msgid "Quick Browser"
msgstr "快速浏览器"
-#: ui/k_mnu.cpp:280
+#: ui/k_mnu.cpp:369 ui/k_new_mnu.cpp:1421
msgid "Run Command..."
msgstr "运行命令..."
-#: ui/k_mnu.cpp:289
-msgid "Switch User"
-msgstr "切换用户"
-
-#: ui/k_mnu.cpp:301
+#: ui/k_mnu.cpp:390 ui/k_new_mnu.cpp:1350
msgid "Save Session"
msgstr "保存会话"
-#: ui/k_mnu.cpp:306
+#: ui/k_mnu.cpp:395
msgid "Lock Session"
msgstr "锁住会话"
-#: ui/k_mnu.cpp:311
+#: ui/k_mnu.cpp:400
msgid "Log Out..."
msgstr "注销..."
-#: ui/k_mnu.cpp:364
+#: ui/k_mnu.cpp:476 ui/k_new_mnu.cpp:939 ui/k_new_mnu.cpp:1535
msgid "Lock Current && Start New Session"
msgstr "锁住当前会话并启动新会话"
-#: ui/k_mnu.cpp:365
+#: ui/k_mnu.cpp:478 ui/k_new_mnu.cpp:936 ui/k_new_mnu.cpp:1536
msgid "Start New Session"
msgstr "启动新会话"
-#: ui/k_mnu.cpp:397
+#: ui/k_mnu.cpp:510 ui/k_new_mnu.cpp:1568
msgid ""
"<p>You have chosen to open another desktop session."
"<br>The current session will be hidden and a new login screen will be "
@@ -370,14 +411,399 @@ msgstr ""
"<br>每个会话被分配一个 F-功能键:F%1 当前分配给第一个会话,F%2 分配给第二个会话,等等。您可以同时按下 Ctrl、Alt 和相应的 "
"F-功能键切换到不同的会话。此外,TDE 面板和桌面菜单也可用于切换会话。</p>"
-#: ui/k_mnu.cpp:408
+#: ui/k_mnu.cpp:521 ui/k_new_mnu.cpp:1579
msgid "Warning - New Session"
msgstr "警告 - 新会话"
-#: ui/k_mnu.cpp:409
+#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1580
msgid "&Start New Session"
msgstr "启动新会话(&S)"
+#: ui/k_new_mnu.cpp:204
+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:223
+msgid "Most commonly used applications and documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:226
+#, fuzzy
+msgid "List of installed applications"
+msgstr "最常使用的应用程序"
+
+#: ui/k_new_mnu.cpp:231
+msgid ""
+"Information and configuration of your system, access to personal files, network "
+"resources and connected disk drives"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:240
+#, fuzzy
+msgid "Recently used applications and documents"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:244
+msgid "<qt>Logout, switch user, switch off or reset, suspend of the system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:248
+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:249
+msgid "<p align=\"center\"><u>H</u>istory</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:251
+msgid "<p align=\"center\"> <u>C</u>omputer</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:252
+msgid "<p align=\"center\"><u>A</u>pplications</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:254
+msgid "<p align=\"center\"><u>L</u>eave</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:314
+msgid "Search Internet"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:326
+#, fuzzy
+msgid "Search Index"
+msgstr "搜索(&S):"
+
+#: ui/k_new_mnu.cpp:415
+#, fuzzy
+msgid "Applications, Contacts and Documents"
+msgstr "应用程序、任务和桌面会话"
+
+#: ui/k_new_mnu.cpp:925
+msgid "Start '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:927
+msgid "Start '%1' (current)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:929
+msgid "Restart and boot directly into '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:937
+#, fuzzy
+msgid "Start a parallel session"
+msgstr "启动新会话"
+
+#: ui/k_new_mnu.cpp:940
+#, fuzzy
+msgid "Lock screen and start a parallel session"
+msgstr "锁住当前会话并启动新会话"
+
+#: ui/k_new_mnu.cpp:951
+msgid "Switch to Session of User '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:952
+#, fuzzy, c-format
+msgid "Session: %1"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1338
+#, fuzzy
+msgid "Session"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1340
+msgid "Logout"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1341
+#, fuzzy
+msgid "End session"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1343
+msgid "Lock"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1344
+#, fuzzy
+msgid "Lock screen"
+msgstr "锁住会话"
+
+#: ui/k_new_mnu.cpp:1351
+msgid "Save current Session for next login"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1357
+msgid "Manage parallel sessions"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1374
+msgid "System"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1375
+msgid "Shutdown Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1376
+msgid "Turn off computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1378
+msgid "&Restart Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1379
+msgid "Restart and boot the default system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1389
+msgid "Start Operating System"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1390
+msgid "Restart and boot another operating system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1425
+#, fuzzy
+msgid "System Folders"
+msgstr "选择文件夹"
+
+#: ui/k_new_mnu.cpp:1427
+#, fuzzy
+msgid "Home Folder"
+msgstr "主文件夹(&H)"
+
+#: ui/k_new_mnu.cpp:1436
+msgid "My Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1445
+msgid "My Images"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1454
+msgid "My Music"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1463
+msgid "My Videos"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1472
+msgid "My Downloads"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1475
+#, fuzzy
+msgid "Network Folders"
+msgstr "选择文件夹"
+
+#: ui/k_new_mnu.cpp:1700
+msgid ""
+"<center><b>%1</b></center>\n"
+"You do not have permission to execute this command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1728
+msgid ""
+"<center><b>%1</b></center>\n"
+"Could not run the specified command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1738
+msgid ""
+"<center><b>%1</b></center>\n"
+"The specified command does not exist."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1936
+msgid "Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2272 ui/k_new_mnu.cpp:2402
+#, c-format
+msgid "Send Email to %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2283
+#, c-format
+msgid "Open Addressbook at %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2324
+msgid "- Add ext:type to specify a file extension."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2327
+msgid "- When searching for a phrase, add quotes."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2330
+msgid "- To exclude search terms, use the minus symbol in front."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2333
+msgid "- To search for optional terms, use OR."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2336
+msgid "- You can use upper and lower case."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2339
+msgid "Search Quick Tips"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2391
+msgid "%1 = %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2423
+#, c-format
+msgid "Open Local File: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2426
+#, c-format
+msgid "Open Local Dir: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2429
+#, c-format
+msgid "Open Remote Location: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2457
+msgid "Run '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2502 ui/k_new_mnu.cpp:2575
+msgid "No matches found"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2627
+msgid "top %1 of %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2629
+msgid "%1 (top %2 of %3)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+msgid "Do you really want to reset the computer and boot Microsoft Windows"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+#, fuzzy
+msgid "Start Windows Confirmation"
+msgstr "快速浏览器配置"
+
+#: ui/k_new_mnu.cpp:2760
+msgid "Start Windows"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2785
+msgid "Could not start Tomboy."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2845
+#, fuzzy
+msgid "Remove From Favorites"
+msgstr "从面板删除(&R)"
+
+#: ui/k_new_mnu.cpp:2852
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "添加到面板(&A)"
+
+#: ui/k_new_mnu.cpp:2883 ui/service_mnu.cpp:630
+msgid "Add Menu to Desktop"
+msgstr "将菜单添加到桌面"
+
+#: ui/k_new_mnu.cpp:2886 ui/service_mnu.cpp:603
+msgid "Add Item to Desktop"
+msgstr "将项目添加到桌面"
+
+#: ui/k_new_mnu.cpp:2893 ui/service_mnu.cpp:636
+msgid "Add Menu to Main Panel"
+msgstr "将菜单添加到主面板"
+
+#: ui/k_new_mnu.cpp:2896 ui/service_mnu.cpp:609
+msgid "Add Item to Main Panel"
+msgstr "将项目添加到主面板"
+
+#: ui/k_new_mnu.cpp:2902 ui/service_mnu.cpp:642
+msgid "Edit Menu"
+msgstr "编辑菜单"
+
+#: ui/k_new_mnu.cpp:2904 ui/service_mnu.cpp:615
+msgid "Edit Item"
+msgstr "编辑项"
+
+#: ui/k_new_mnu.cpp:2910 ui/service_mnu.cpp:621
+msgid "Put Into Run Dialog"
+msgstr "放入运行对话框"
+
+#: ui/k_new_mnu.cpp:2938
+msgid "Advanced"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2954
+#, fuzzy
+msgid "Clear Recently Used Applications"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:2957
+#, fuzzy
+msgid "Clear Recently Used Documents"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:3542
+msgid "Media"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3601
+msgid "(%1 available)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3732 ui/k_new_mnu.cpp:3736
+#, c-format
+msgid "Directory: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3828
+msgid "Suspend to Disk"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3829 ui/k_new_mnu.cpp:3837 ui/k_new_mnu.cpp:3845
+#: ui/k_new_mnu.cpp:3853
+msgid "Pause without logging out"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3836
+msgid "Suspend to RAM"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3844
+msgid "Freeze"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3852
+msgid "Standby"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3921
+msgid "Suspend failed"
+msgstr ""
+
#: ui/quickbrowser_mnu.cpp:48
msgid "&Home Folder"
msgstr "主文件夹(&H)"
@@ -433,58 +859,30 @@ msgstr "%1 (左边)"
msgid "%1 (Floating)"
msgstr "%1 (浮动)"
-#: ui/service_mnu.cpp:262
+#: ui/service_mnu.cpp:368
msgid "No Entries"
msgstr "空"
-#: ui/service_mnu.cpp:269
+#: ui/service_mnu.cpp:375
msgid "Add This Menu"
msgstr "添加此菜单"
-#: ui/service_mnu.cpp:274
+#: ui/service_mnu.cpp:380
msgid "Add Non-TDE Application"
msgstr "添加非 TDE 应用程序"
-#: ui/service_mnu.cpp:314
+#: ui/service_mnu.cpp:421
msgid ""
"_: Entries in K-menu: %1 app name, %2 description\n"
"%1 - %2"
msgstr "%1 - %2"
-#: ui/service_mnu.cpp:324
+#: ui/service_mnu.cpp:431
msgid ""
"_: Entries in K-menu: %1 description, %2 app name\n"
"%1 (%2)"
msgstr "%1 (%2)"
-#: ui/service_mnu.cpp:488
-msgid "Add Item to Desktop"
-msgstr "将项目添加到桌面"
-
-#: ui/service_mnu.cpp:494
-msgid "Add Item to Main Panel"
-msgstr "将项目添加到主面板"
-
-#: ui/service_mnu.cpp:500
-msgid "Edit Item"
-msgstr "编辑项"
-
-#: ui/service_mnu.cpp:506
-msgid "Put Into Run Dialog"
-msgstr "放入运行对话框"
-
-#: ui/service_mnu.cpp:515
-msgid "Add Menu to Desktop"
-msgstr "将菜单添加到桌面"
-
-#: ui/service_mnu.cpp:521
-msgid "Add Menu to Main Panel"
-msgstr "将菜单添加到主面板"
-
-#: ui/service_mnu.cpp:527
-msgid "Edit Menu"
-msgstr "编辑菜单"
-
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -547,22 +945,28 @@ msgstr "<qt>这是小程序列表。选择一个小程序,然后单击<b>添
msgid "&Add to Panel"
msgstr "添加到面板(&A)"
-#. i18n: file ui/nonTDEButtonSettings.ui line 30
-#: rc.cpp:33 rc.cpp:58
+#. i18n: file ui/kmenuitembase.ui line 36
+#: rc.cpp:33
+#, no-c-format
+msgid "KMenuItemBase"
+msgstr ""
+
+#. i18n: file ui/nonKDEButtonSettings.ui line 30
+#: rc.cpp:36 rc.cpp:61
#, no-c-format
msgid ""
"Enter the name of the executable file to be run when this button is selected. "
"If it is not in your $PATH then you will need to provide an absolute path."
msgstr "输入选择此按钮后要运行的可执行文件名称。如果该文件所在的文件夹没有在您的 $PATH 中列出,您就必须提供绝对路径。"
-#. i18n: file ui/nonTDEButtonSettings.ui line 38
-#: rc.cpp:36
+#. i18n: file ui/nonKDEButtonSettings.ui line 38
+#: rc.cpp:39
#, no-c-format
msgid "Co&mmand line arguments (optional):"
msgstr "可选的命令行参数(&M):"
-#. i18n: file ui/nonTDEButtonSettings.ui line 46
-#: rc.cpp:39 rc.cpp:50
+#. i18n: file ui/nonKDEButtonSettings.ui line 46
+#: rc.cpp:42 rc.cpp:53
#, no-c-format
msgid ""
"Enter any command line options that should be passed to the command here.\n"
@@ -573,46 +977,46 @@ msgstr ""
"\n"
"<i>示例</i>:对于命令 `rm -fr`,请在此框中输入“-rf”。"
-#. i18n: file ui/nonTDEButtonSettings.ui line 54
-#: rc.cpp:44
+#. i18n: file ui/nonKDEButtonSettings.ui line 54
+#: rc.cpp:47
#, no-c-format
msgid "Run in a &terminal window"
msgstr "在终端窗口中运行(&T)"
-#. i18n: file ui/nonTDEButtonSettings.ui line 57
-#: rc.cpp:47
+#. i18n: file ui/nonKDEButtonSettings.ui line 57
+#: rc.cpp:50
#, no-c-format
msgid ""
"Select this option if the command is a command line application and you wish to "
"be able to see its output when run."
msgstr "如果命令是一个命令行应用程序,而您想要在运行时看到其输入,请选择此选项。"
-#. i18n: file ui/nonTDEButtonSettings.ui line 75
-#: rc.cpp:55
+#. i18n: file ui/nonKDEButtonSettings.ui line 75
+#: rc.cpp:58
#, no-c-format
msgid "&Executable:"
msgstr "可执行程序(&E):"
-#. i18n: file ui/nonTDEButtonSettings.ui line 97
-#: rc.cpp:61 rc.cpp:67 rc.cpp:73 rc.cpp:76
+#. i18n: file ui/nonKDEButtonSettings.ui line 97
+#: rc.cpp:64 rc.cpp:70 rc.cpp:76 rc.cpp:79
#, no-c-format
msgid "Enter the name you would like to appear for this button here."
msgstr "输入您想要此按钮在此出现的名称。"
-#. i18n: file ui/nonTDEButtonSettings.ui line 105
-#: rc.cpp:64
+#. i18n: file ui/nonKDEButtonSettings.ui line 105
+#: rc.cpp:67
#, no-c-format
msgid "&Button title:"
msgstr "按钮标题(&B):"
-#. i18n: file ui/nonTDEButtonSettings.ui line 167
-#: rc.cpp:70
+#. i18n: file ui/nonKDEButtonSettings.ui line 167
+#: rc.cpp:73
#, no-c-format
msgid "&Description:"
msgstr "描述(&D):"
#. i18n: file core/extensionSettings.kcfg line 14
-#: rc.cpp:79
+#: rc.cpp:82
#, no-c-format
msgid ""
"Whether this panel actually exists or not. Primarily to work around the fact "
@@ -621,103 +1025,109 @@ msgid ""
msgstr "此面板是否已经存在。主要用于解决 TDEConfigXT 不会写入不包含非默认项的配置文件的问题。"
#. i18n: file core/extensionSettings.kcfg line 18
-#: rc.cpp:82
+#: rc.cpp:85
#, no-c-format
msgid "The position of the panel"
msgstr "面板的位置"
#. i18n: file core/extensionSettings.kcfg line 25
-#: rc.cpp:85
+#: rc.cpp:88
#, no-c-format
msgid "The alignment of the panel"
msgstr "面板的对齐方式"
#. i18n: file core/extensionSettings.kcfg line 32
-#: rc.cpp:88
+#: rc.cpp:91
#, no-c-format
msgid "Primary xinerama screen"
msgstr "主 xinerama 屏幕"
#. i18n: file core/extensionSettings.kcfg line 37
-#: rc.cpp:91
+#: rc.cpp:94
#, no-c-format
msgid "Hide button size"
msgstr "隐藏按钮大小"
#. i18n: file core/extensionSettings.kcfg line 44
-#: rc.cpp:94
+#: rc.cpp:97
#, no-c-format
msgid "Show left panel hide button"
msgstr "显示左侧面板的隐藏按钮"
#. i18n: file core/extensionSettings.kcfg line 49
-#: rc.cpp:97
+#: rc.cpp:100
#, no-c-format
msgid "Show right panel hide button"
msgstr "显示右侧面板的隐藏按钮"
#. i18n: file core/extensionSettings.kcfg line 54
-#: rc.cpp:100
+#: rc.cpp:103
#, no-c-format
msgid "Auto hide panel"
msgstr "自动隐藏面板"
#. i18n: file core/extensionSettings.kcfg line 59
-#: rc.cpp:103
+#: rc.cpp:106
#, no-c-format
msgid "Enable auto hide"
msgstr "启用自动隐藏"
#. i18n: file core/extensionSettings.kcfg line 64
-#: rc.cpp:106
+#: rc.cpp:109
+#, no-c-format
+msgid "Auto hide when Xinerama screen is not available"
+msgstr ""
+
+#. i18n: file core/extensionSettings.kcfg line 69
+#: rc.cpp:112
#, no-c-format
msgid "Delay before auto hide"
msgstr "自动隐藏的延时"
-#. i18n: file core/extensionSettings.kcfg line 69
-#: rc.cpp:109
+#. i18n: file core/extensionSettings.kcfg line 74
+#: rc.cpp:115
#, no-c-format
msgid "The trigger location for unhides"
msgstr "取消隐藏的触发位置"
-#. i18n: file core/extensionSettings.kcfg line 76
-#: rc.cpp:112
+#. i18n: file core/extensionSettings.kcfg line 81
+#: rc.cpp:118
#, no-c-format
msgid "Enable background hiding"
msgstr "启用背景隐藏"
-#. i18n: file core/extensionSettings.kcfg line 81
-#: rc.cpp:115
+#. i18n: file core/extensionSettings.kcfg line 86
+#: rc.cpp:121
#, no-c-format
msgid "Animate panel hiding"
msgstr "动画式隐藏面板"
-#. i18n: file core/extensionSettings.kcfg line 86
-#: rc.cpp:118
+#. i18n: file core/extensionSettings.kcfg line 91
+#: rc.cpp:124
#, no-c-format
msgid "Panel hiding animation speed"
msgstr "面板隐藏动画速度"
-#. i18n: file core/extensionSettings.kcfg line 91
-#: rc.cpp:121
+#. i18n: file core/extensionSettings.kcfg line 96
+#: rc.cpp:127
#, no-c-format
msgid "Length in percentage"
msgstr "百分比长度"
-#. i18n: file core/extensionSettings.kcfg line 98
-#: rc.cpp:124
+#. i18n: file core/extensionSettings.kcfg line 103
+#: rc.cpp:130
#, no-c-format
msgid "Expand as required to fit contents"
msgstr "展开以便适合内容"
-#. i18n: file core/extensionSettings.kcfg line 103
-#: rc.cpp:127
+#. i18n: file core/extensionSettings.kcfg line 108
+#: rc.cpp:133
#, no-c-format
msgid "Size"
msgstr "大小"
-#. i18n: file core/extensionSettings.kcfg line 108
-#: rc.cpp:130
+#. i18n: file core/extensionSettings.kcfg line 113
+#: rc.cpp:136
#, no-c-format
msgid "Custom size"
msgstr "自定义大小"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po b/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
index 6330a41b3a9..2be08d43414 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2006-11-16 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-21 17:13+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po b/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
index 1ade082293a..11aefbe7d5b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kjobviewer\n"
-"POT-Creation-Date: 2006-03-12 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:13+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/klipper.po b/tde-i18n-zh_CN/messages/tdebase/klipper.po
index 94975307aa0..ee73436a0f7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/klipper.po
+++ b/tde-i18n-zh_CN/messages/tdebase/klipper.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: klipper\n"
-"POT-Creation-Date: 2006-06-17 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -115,111 +116,111 @@ msgid "Sy&nchronize contents of the clipboard and the selection"
msgstr "同步剪贴板和选中内容(&N)"
#: configdialog.cpp:141
-msgid ""
-"Selecting this option synchronizes these two buffers, so they work the same way "
-"as in TDE 1.x and 2.x."
+#, fuzzy
+msgid "Selecting this option synchronizes these two buffers."
msgstr "选中此选项将同步这两个缓冲区,这样与 TDE 1.x 和 2.x 工作方式相同。"
-#: configdialog.cpp:145
+#: configdialog.cpp:144
msgid "Separate clipboard and selection"
msgstr "区分剪贴板和选中内容"
-#: configdialog.cpp:148
+#: configdialog.cpp:147
msgid ""
"Using this option will only set the selection when highlighting something and "
"the clipboard when choosing e.g. \"Copy\" in a menubar."
msgstr "使用此选项将区分两者,在突出显示文本的时候设置选中内容,而在选择“复制”这样的操作的时候设置剪贴板。"
-#: configdialog.cpp:155
+#: configdialog.cpp:154
msgid "Tim&eout for action popups:"
msgstr "动作弹出的超时时间(&E):"
-#: configdialog.cpp:157
+#: configdialog.cpp:156
msgid " sec"
msgstr " 秒"
-#: configdialog.cpp:158
+#: configdialog.cpp:157
msgid "A value of 0 disables the timeout"
msgstr "值为 0 代表禁用超时"
-#: configdialog.cpp:161
+#: configdialog.cpp:160
msgid "C&lipboard history size:"
msgstr "剪贴板历史大小(&L):"
-#: configdialog.cpp:183
+#: configdialog.cpp:182
msgid ""
"_n: entry\n"
" entries"
msgstr " 项"
-#: configdialog.cpp:229
+#: configdialog.cpp:228
msgid "Action &list (right click to add/remove commands):"
msgstr "动作列表(右键点击增加或删除命令)(&L):"
-#: configdialog.cpp:233
-msgid "Regular Expression (see http://doc.trolltech.com/qregexp.html#details)"
+#: configdialog.cpp:232
+#, fuzzy
+msgid "Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)"
msgstr "正规表达式(参见 http://doc.trolltech.com/qregexp.html#details)"
-#: configdialog.cpp:234
+#: configdialog.cpp:233
msgid "Description"
msgstr "描述"
-#: configdialog.cpp:286
+#: configdialog.cpp:285
msgid "&Use graphical editor for editing regular expressions"
msgstr "使用图形编辑器编辑正规表达式(&U)"
-#: configdialog.cpp:295
+#: configdialog.cpp:294
msgid "&Add Action"
msgstr "添加动作(&A)"
-#: configdialog.cpp:298
+#: configdialog.cpp:297
msgid "&Delete Action"
msgstr "删除动作(&D)"
-#: configdialog.cpp:301
+#: configdialog.cpp:300
#, c-format
msgid ""
"Click on a highlighted item's column to change it. \"%s\" in a command will be "
"replaced with the clipboard contents."
msgstr "点击突出显示项目的列进行修改。命令中“%s”将被剪贴板中的内容替换。"
-#: configdialog.cpp:307
+#: configdialog.cpp:306
msgid "Advanced..."
msgstr "高级..."
-#: configdialog.cpp:332
+#: configdialog.cpp:331
msgid "Add Command"
msgstr "添加命令"
-#: configdialog.cpp:333
+#: configdialog.cpp:332
msgid "Remove Command"
msgstr "删除命令"
-#: configdialog.cpp:343
+#: configdialog.cpp:342
msgid "Click here to set the command to be executed"
msgstr "点击这里设置要执行的命令"
-#: configdialog.cpp:344
+#: configdialog.cpp:343
msgid "<new command>"
msgstr "<新命令>"
-#: configdialog.cpp:366
+#: configdialog.cpp:365
msgid "Click here to set the regexp"
msgstr "点击这里设置正规表达式"
-#: configdialog.cpp:367
+#: configdialog.cpp:366
msgid "<new action>"
msgstr "<新动作>"
-#: configdialog.cpp:407
+#: configdialog.cpp:406
msgid "Advanced Settings"
msgstr "高级设置"
-#: configdialog.cpp:424
+#: configdialog.cpp:423
msgid "D&isable Actions for Windows of Type WM_CLASS"
msgstr "禁止在 WM_CLASS 类型的窗口上的动作(&I):"
-#: configdialog.cpp:427
+#: configdialog.cpp:426
msgid ""
"<qt>This lets you specify windows in which Klipper should not invoke "
"\"actions\". Use"
@@ -275,67 +276,67 @@ msgstr "清除剪贴板历史(&L)"
msgid "&Configure Klipper..."
msgstr "配置 Klipper(&C)..."
-#: toplevel.cpp:225
+#: toplevel.cpp:232
msgid "Klipper - clipboard tool"
msgstr "Klipper - 剪贴板工具"
-#: toplevel.cpp:525
+#: toplevel.cpp:543
msgid ""
"You can enable URL actions later by right-clicking on the Klipper icon and "
"selecting 'Enable Actions'"
msgstr "如果想要稍候启用 URL 动作,可以用右键单击 Klipper 图标然后选择“启用动作”。"
-#: toplevel.cpp:592
+#: toplevel.cpp:610
msgid ""
"Should Klipper start automatically\n"
"when you login?"
msgstr "是否在您登录时自动启动 Klipper?"
-#: toplevel.cpp:592
+#: toplevel.cpp:610
msgid "Automatically Start Klipper?"
msgstr "自动启动 Klipper 吗?"
-#: toplevel.cpp:592
+#: toplevel.cpp:610
msgid "Start"
msgstr "启动"
-#: toplevel.cpp:592
+#: toplevel.cpp:610
msgid "Do Not Start"
msgstr "不启动"
-#: toplevel.cpp:647
+#: toplevel.cpp:665
msgid "Enable &Actions"
msgstr "启用动作(&A)"
-#: toplevel.cpp:651
+#: toplevel.cpp:669
msgid "&Actions Enabled"
msgstr "动作已启用(&A)"
-#: toplevel.cpp:1089
+#: toplevel.cpp:1104
msgid "TDE cut & paste history utility"
msgstr "TDE 剪切和粘贴历史工具"
-#: toplevel.cpp:1093
+#: toplevel.cpp:1108
msgid "Klipper"
msgstr "Klipper"
-#: toplevel.cpp:1100
+#: toplevel.cpp:1115
msgid "Author"
msgstr "作者"
-#: toplevel.cpp:1104
+#: toplevel.cpp:1119
msgid "Original Author"
msgstr "原创作者"
-#: toplevel.cpp:1108
+#: toplevel.cpp:1123
msgid "Contributor"
msgstr "贡献者"
-#: toplevel.cpp:1112
+#: toplevel.cpp:1127
msgid "Bugfixes and optimizations"
msgstr "错误修正和优化"
-#: toplevel.cpp:1116
+#: toplevel.cpp:1131
msgid "Maintainer"
msgstr "维护者"
@@ -343,15 +344,15 @@ msgstr "维护者"
msgid " - Actions For: "
msgstr " - 动作用于:"
-#: urlgrabber.cpp:195
+#: urlgrabber.cpp:196
msgid "Disable This Popup"
msgstr "禁用此弹出菜单"
-#: urlgrabber.cpp:199
+#: urlgrabber.cpp:200
msgid "&Edit Contents..."
msgstr "编辑内容(&E)..."
-#: urlgrabber.cpp:262
+#: urlgrabber.cpp:271
msgid "Edit Contents"
msgstr "编辑内容"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po b/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
index e8fe327a9e8..7642e0ad63c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
@@ -5,15 +5,16 @@
msgid ""
msgstr ""
"Project-Id-Version: kmenuapplet\n"
-"POT-Creation-Date: 2008-08-11 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-05 14:01+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: menuapplet.cpp:352
+#: menuapplet.cpp:350
msgid ""
"You do not appear to have enabled the standalone menubar; enable it in the "
"Behavior control module for desktop."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po b/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
index a3b5e44f19a..308c3c23eb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kmenuedit\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-11-15 15:31+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -100,13 +101,13 @@ msgstr "用户名(&U):"
msgid "Current shortcut &key:"
msgstr "当前快捷键(&K):"
-#: basictab.cpp:485
+#: basictab.cpp:490
msgid ""
"<qt>The key <b>%1</b> can not be used here because it is already used to "
"activate <b>%2</b>."
msgstr "<qt>无法在此使用按键 <b>%1</b>,因为该按键已经用于激活 <b>%2</b>。"
-#: basictab.cpp:490
+#: basictab.cpp:495
msgid ""
"<qt>The key <b>%1</b> can not be used here because it is already in use."
msgstr "<qt>无法在此使用按键 <b>%1</b>,因为该按键已在使用中。"
@@ -143,7 +144,11 @@ msgstr "新建菜单项(&I)..."
msgid "New S&eparator"
msgstr "新建分隔符(&E)"
-#: kmenuedit.cpp:153
+#: kmenuedit.cpp:70
+msgid "Save && Quit"
+msgstr ""
+
+#: kmenuedit.cpp:161
msgid ""
"You have made changes to the Control Center.\n"
"Do you want to save the changes or discard them?"
@@ -151,11 +156,11 @@ msgstr ""
"您已经更改了控制中心。\n"
"您是想要保存更改还是丢弃更改?"
-#: kmenuedit.cpp:155
+#: kmenuedit.cpp:163
msgid "Save Control Center Changes?"
msgstr "保存对控制中心的更改吗?"
-#: kmenuedit.cpp:161
+#: kmenuedit.cpp:169
msgid ""
"You have made changes to the menu.\n"
"Do you want to save the changes or discard them?"
@@ -163,7 +168,7 @@ msgstr ""
"您已经更改了菜单。\n"
"您是想要保存更改还是丢弃更改?"
-#: kmenuedit.cpp:163
+#: kmenuedit.cpp:171
msgid "Save Menu Changes?"
msgstr "保存对菜单的更改吗?"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po b/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
index fb4debb0817..a012524050f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
@@ -5,113 +5,118 @@
msgid ""
msgstr ""
"Project-Id-Version: kminipagerapplet\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-07-17 10:05+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Wang Jian <lark@linux.net.cn>\n"
-#: pagerapplet.cpp:680
+#: pagerapplet.cpp:713
msgid "&Launch Pager"
msgstr "启动切换器(&L)"
-#: pagerapplet.cpp:683
+#: pagerapplet.cpp:716
msgid "&Rename Desktop \"%1\""
msgstr "重命名桌面“%1”(&R)"
-#: pagerapplet.cpp:689
+#: pagerapplet.cpp:722
msgid "Pager Layout"
msgstr "切换器布局"
-#: pagerapplet.cpp:693
+#: pagerapplet.cpp:726
msgid "&Automatic"
msgstr "自动(&A)"
-#: pagerapplet.cpp:694
+#: pagerapplet.cpp:727
msgid ""
"_: one row or column\n"
"&1"
msgstr "&1"
-#: pagerapplet.cpp:695
+#: pagerapplet.cpp:728
msgid ""
"_: two rows or columns\n"
"&2"
msgstr "&2"
-#: pagerapplet.cpp:696
+#: pagerapplet.cpp:729
msgid ""
"_: three rows or columns\n"
"&3"
msgstr "&3"
-#: pagerapplet.cpp:698
+#: pagerapplet.cpp:731
msgid "&Rows"
msgstr "行数(&R)"
-#: pagerapplet.cpp:699
+#: pagerapplet.cpp:732
msgid "&Columns"
msgstr "列数(&C)"
-#: pagerapplet.cpp:702
+#: pagerapplet.cpp:735
msgid "&Window Thumbnails"
msgstr "窗口缩略图(&W)"
-#: pagerapplet.cpp:703
+#: pagerapplet.cpp:736
msgid "&Window Icons"
msgstr "窗口图标(&W)"
-#: pagerapplet.cpp:705
+#: pagerapplet.cpp:737
+msgid "&Cycle on Wheel"
+msgstr ""
+
+#: pagerapplet.cpp:739
msgid "Text Label"
msgstr "文本标签"
-#: pagerapplet.cpp:706
+#: pagerapplet.cpp:740
msgid "Desktop N&umber"
msgstr "桌面编号(&U)"
-#: pagerapplet.cpp:708
+#: pagerapplet.cpp:742
msgid "Desktop N&ame"
msgstr "桌面名称(&A)"
-#: pagerapplet.cpp:710
+#: pagerapplet.cpp:744
msgid "N&o Label"
msgstr "无标签(&O)"
-#: pagerapplet.cpp:713
+#: pagerapplet.cpp:747
msgid "Background"
msgstr "背景"
-#: pagerapplet.cpp:714
+#: pagerapplet.cpp:748
msgid "&Elegant"
msgstr "智能(&E)"
-#: pagerapplet.cpp:716
+#: pagerapplet.cpp:750
msgid "&Transparent"
msgstr "透明(&T)"
-#: pagerapplet.cpp:718
+#: pagerapplet.cpp:753
msgid "&Desktop Wallpaper"
msgstr "桌面壁纸(&D)"
-#: pagerapplet.cpp:721
+#: pagerapplet.cpp:757
msgid "&Pager Options"
msgstr "分页选项(&P)"
-#: pagerapplet.cpp:724
+#: pagerapplet.cpp:760
msgid "&Configure Desktops..."
msgstr "配置桌面(&C)..."
-#: pagerbutton.cpp:807
+#: pagerbutton.cpp:819
#, c-format
msgid ""
"_n: and 1 other\n"
"and %n others"
msgstr "及其它 %n 个桌面"
-#: pagerbutton.cpp:815
+#: pagerbutton.cpp:827
#, c-format
msgid ""
"_n: One window:\n"
@@ -184,5 +189,11 @@ msgstr "显示桌面预览?"
msgid "Show window icons in previews?"
msgstr "在预览中显示窗口图标?"
+#. i18n: file pagersettings.kcfg line 59
+#: rc.cpp:36
+#, no-c-format
+msgid "Cycle through desktops with wheel?"
+msgstr ""
+
#~ msgid "and %1 others"
#~ msgstr "及其它 %1 个桌面"
diff --git a/tde-i18n-zh_CN/messages/tdebase/knetattach.po b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
index 777b31474aa..d7a9db91188 100644
--- a/tde-i18n-zh_CN/messages/tdebase/knetattach.po
+++ b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: knetattach\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-02-12 17:15+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konqueror.po b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
index 9ff4811007d..1061bc7ad15 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konqueror.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: konqueror\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-07-17 10:02+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +69,7 @@ msgid ""
msgstr "如果您启用了此选项,Konqueror 将在您打开文件夹时另外打开一个新窗口,而不是在当前窗口中显示文件夹内容。"
#. i18n: file konqueror.kcfg line 20
-#: about/konq_aboutpage.cc:124 rc.cpp:75
+#: about/konq_aboutpage.cc:151 rc.cpp:75
#, no-c-format
msgid "Home Folder"
msgstr "主文件夹"
@@ -153,19 +154,19 @@ msgstr "标准字体"
msgid "This is the font used to display text in Konqueror windows."
msgstr "这是在 Konqueror 窗口中显示文字所用的的字体。"
-#. i18n: file konqueror.kcfg line 598
+#. i18n: file konqueror.kcfg line 604
#: rc.cpp:111
#, no-c-format
msgid "Ask confirmation for deleting a file."
msgstr "删除文件时请求确认。"
-#. i18n: file konqueror.kcfg line 604
+#. i18n: file konqueror.kcfg line 610
#: rc.cpp:114
#, no-c-format
msgid "Ask confirmation for move to trash"
msgstr "移至回收站时请求确认"
-#. i18n: file konqueror.kcfg line 605
+#. i18n: file konqueror.kcfg line 611
#: rc.cpp:117
#, no-c-format
msgid ""
@@ -173,7 +174,7 @@ msgid ""
"file to your trash folder, from where it can be recovered very easily."
msgstr "此选项将控制在您将文件移动到回收站时 Konqueror 是否应请求您的确认,以免您误删文件。"
-#. i18n: file konqueror.kcfg line 615
+#. i18n: file konqueror.kcfg line 621
#: rc.cpp:120
#, no-c-format
msgid ""
@@ -199,13 +200,13 @@ msgstr "图标大小(&I)"
msgid "S&ort"
msgstr "排序(&O)"
-#. i18n: file iconview/konq_iconview.rc line 43
+#. i18n: file iconview/konq_iconview.rc line 44
#: rc.cpp:204
#, no-c-format
msgid "Iconview Toolbar"
msgstr "图标视图工具栏"
-#. i18n: file iconview/konq_iconview.rc line 48
+#. i18n: file iconview/konq_iconview.rc line 49
#: rc.cpp:207
#, no-c-format
msgid "Iconview Extra Toolbar"
@@ -320,7 +321,7 @@ msgid "URLs older than"
msgstr "URL 旧于"
#. i18n: file sidebar/trees/history_module/history_dlg.ui line 151
-#: about/konq_aboutpage.cc:277 rc.cpp:375
+#: about/konq_aboutpage.cc:304 rc.cpp:375
#, no-c-format
msgid "Details"
msgstr "细节"
@@ -371,8 +372,8 @@ msgstr ""
"诊断信息是:\n"
"%2"
-#: about/konq_aboutpage.cc:113 about/konq_aboutpage.cc:178
-#: about/konq_aboutpage.cc:233 about/konq_aboutpage.cc:330 konq_factory.cc:218
+#: about/konq_aboutpage.cc:140 about/konq_aboutpage.cc:205
+#: about/konq_aboutpage.cc:260 about/konq_aboutpage.cc:357 konq_factory.cc:218
msgid "Konqueror"
msgstr "Konqueror"
@@ -381,7 +382,8 @@ msgid "Web browser, file manager, ..."
msgstr "Web 浏览器、文件管理器……"
#: konq_factory.cc:222
-msgid "(c) 1999-2005, The Konqueror developers"
+#, fuzzy
+msgid "(c) 1999-2010, The Konqueror developers"
msgstr "(c) 1999-2005,Konqueror 开发者"
#: konq_factory.cc:224
@@ -389,103 +391,107 @@ msgid "http://konqueror.kde.org"
msgstr "http://konqueror.kde.org"
#: konq_factory.cc:225
+msgid "Maintainer, Trinity bugfixes"
+msgstr ""
+
+#: konq_factory.cc:226
msgid "developer (framework, parts, JavaScript, I/O lib) and maintainer"
msgstr "开发者(框架、组件、JavaScript、I/O 库)和维护者"
-#: konq_factory.cc:226
+#: konq_factory.cc:227
msgid "developer (framework, parts)"
msgstr "开发者(框架、组件)"
-#: konq_factory.cc:227 konq_factory.cc:254
+#: konq_factory.cc:228 konq_factory.cc:255
msgid "developer (framework)"
msgstr "开发者(框架)"
-#: konq_factory.cc:228
+#: konq_factory.cc:229
msgid "developer"
msgstr "开发者"
-#: konq_factory.cc:229
+#: konq_factory.cc:230
msgid "developer (List views)"
msgstr "开发者(列表视图)"
-#: konq_factory.cc:230
+#: konq_factory.cc:231
msgid "developer (List views, I/O lib)"
msgstr "开发者(列表视图、I/O 库)"
-#: konq_factory.cc:231 konq_factory.cc:232 konq_factory.cc:233
-#: konq_factory.cc:235 konq_factory.cc:236 konq_factory.cc:238
-#: konq_factory.cc:239 konq_factory.cc:240 konq_factory.cc:241
-#: konq_factory.cc:242
+#: konq_factory.cc:232 konq_factory.cc:233 konq_factory.cc:234
+#: konq_factory.cc:236 konq_factory.cc:237 konq_factory.cc:239
+#: konq_factory.cc:240 konq_factory.cc:241 konq_factory.cc:242
+#: konq_factory.cc:243
msgid "developer (HTML rendering engine)"
msgstr "开发者(HTML 绘制引擎)"
-#: konq_factory.cc:234
+#: konq_factory.cc:235
msgid "developer (HTML rendering engine, I/O lib)"
msgstr "开发者(HTML 绘制引擎、I/O 库)"
-#: konq_factory.cc:237
+#: konq_factory.cc:238
msgid "developer (HTML rendering engine, I/O lib, regression test framework)"
msgstr "开发者(HTML 绘制引擎、I/O 库、框架的深入测试)"
-#: konq_factory.cc:243
+#: konq_factory.cc:244
msgid "developer (HTML rendering engine, JavaScript)"
msgstr "开发者(HTML 绘制引擎、JavaScript)"
-#: konq_factory.cc:244
+#: konq_factory.cc:245
msgid "developer (JavaScript)"
msgstr "开发者(JavaScript)"
-#: konq_factory.cc:245
+#: konq_factory.cc:246
msgid "developer (Java applets and other embedded objects)"
msgstr "开发者(Java 小程序支持和其它嵌入对象)"
-#: konq_factory.cc:246 konq_factory.cc:247
+#: konq_factory.cc:247 konq_factory.cc:248
msgid "developer (I/O lib)"
msgstr "开发者(I/O 库)"
-#: konq_factory.cc:248 konq_factory.cc:249
+#: konq_factory.cc:249 konq_factory.cc:250
msgid "developer (Java applet support)"
msgstr "开发者(Java 小程序支持)"
-#: konq_factory.cc:250
+#: konq_factory.cc:251
msgid ""
"developer (Java 2 security manager support,\n"
" and other major improvements to applet support)"
msgstr "开发者(Java 2 安全管理器支持和其它对小程序支持的重要改进)"
-#: konq_factory.cc:251
+#: konq_factory.cc:252
msgid "developer (Netscape plugin support)"
msgstr "开发者(Netscape 插件支持)"
-#: konq_factory.cc:252
+#: konq_factory.cc:253
msgid "developer (SSL, Netscape plugins)"
msgstr "开发者(SSL,Netscape 插件支持)"
-#: konq_factory.cc:253
+#: konq_factory.cc:254
msgid "developer (I/O lib, Authentication support)"
msgstr "开发者(I/O 库、验证支持)"
-#: konq_factory.cc:255
+#: konq_factory.cc:256
msgid "graphics/icons"
msgstr "图像和图标"
-#: konq_factory.cc:256
+#: konq_factory.cc:257
msgid "kfm author"
msgstr "kfm 作者"
-#: konq_factory.cc:257
+#: konq_factory.cc:258
msgid "developer (navigation panel framework)"
msgstr "开发者(导航面板框架)"
-#: konq_factory.cc:258
+#: konq_factory.cc:259
msgid "developer (misc stuff)"
msgstr "开发者(杂项)"
-#: konq_factory.cc:259
+#: konq_factory.cc:260
msgid "developer (AdBlock filter)"
msgstr "开发者(广告过滤)"
-#: konq_frame.cc:85
+#: konq_frame.cc:86
msgid ""
"Checking this box on at least two views sets those views as 'linked'. Then, "
"when you change directories in one view, the other views linked with it will "
@@ -496,15 +502,15 @@ msgstr ""
"在至少两个视图中选中此选项将设置这些视图为“被链接的”。然后,当您在一个视图中更改目录时,其它与它链的视视图将自动更新并显示当前目录。这在多个不同类型的视图中非"
"常有用,例如使用图标视图或详细视图的目录树,或者终端模拟窗口。"
-#: konq_frame.cc:148
+#: konq_frame.cc:154
msgid "Close View"
msgstr "关闭视图"
-#: konq_frame.cc:229
+#: konq_frame.cc:235
msgid "%1/s"
msgstr "%1/s"
-#: konq_frame.cc:231
+#: konq_frame.cc:237
msgid "Stalled"
msgstr "暂停"
@@ -517,12 +523,12 @@ msgstr "在 %1 里预览"
msgid "Preview In"
msgstr "选择预览程序"
-#: konq_guiclients.cc:190
+#: konq_guiclients.cc:195
#, c-format
msgid "Show %1"
msgstr "显示 %1"
-#: konq_guiclients.cc:194
+#: konq_guiclients.cc:199
#, c-format
msgid "Hide %1"
msgstr "隐藏 %1"
@@ -557,7 +563,7 @@ msgstr "对于指向文件的 URLs,打开目录并选择文件,而不是打
msgid "Location to open"
msgstr "要打开的位置"
-#: konq_mainwindow.cc:495
+#: konq_mainwindow.cc:562
#, c-format
msgid ""
"Malformed URL\n"
@@ -566,7 +572,7 @@ msgstr ""
"不正确的 URL\n"
"%1"
-#: konq_mainwindow.cc:500
+#: konq_mainwindow.cc:567
#, c-format
msgid ""
"Protocol not supported\n"
@@ -575,25 +581,25 @@ msgstr ""
"不支持协议\n"
"%1"
-#: konq_mainwindow.cc:583 konq_run.cc:119
+#: konq_mainwindow.cc:650 konq_run.cc:119
msgid ""
"There appears to be a configuration error. You have associated Konqueror with "
"%1, but it cannot handle this file type."
msgstr "看起来有配置错误。您将 Konqueror 和 %1 相关联,但它无法处理该文件类型。"
-#: konq_mainwindow.cc:1414
+#: konq_mainwindow.cc:1480
msgid "Open Location"
msgstr "打开位置"
-#: konq_mainwindow.cc:1445
+#: konq_mainwindow.cc:1511
msgid "Cannot create the find part, check your installation."
msgstr "无法创建查找部件,请检查您的安装。"
-#: konq_mainwindow.cc:1721
+#: konq_mainwindow.cc:1787
msgid "Canceled."
msgstr "已取消。"
-#: konq_mainwindow.cc:1759
+#: konq_mainwindow.cc:1825
msgid ""
"This page contains changes that have not been submitted.\n"
"Reloading the page will discard these changes."
@@ -601,33 +607,55 @@ msgstr ""
"此页面包含尚未提交的更改。\n"
"重新装入页面将会丢弃这些更改。"
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
msgid "Discard Changes?"
msgstr "丢弃更改吗?"
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
msgid "&Discard Changes"
msgstr "丢弃更改(&D)"
-#: konq_mainwindow.cc:1865
+#: konq_mainwindow.cc:1855 konq_mainwindow.cc:4048
+msgid ""
+"Stop loading the document"
+"<p>All network transfers will be stopped and Konqueror will display the content "
+"that has been received so far."
+msgstr "停止装入文档<p>所有网络传输都会停止,Konqueror 将显示已经接受到的文档内容。"
+
+#: konq_mainwindow.cc:1858 konq_mainwindow.cc:4051
+msgid "Stop loading the document"
+msgstr "停止装入文件"
+
+#: konq_mainwindow.cc:1862 konq_mainwindow.cc:4038
+msgid ""
+"Reload the currently displayed document"
+"<p>This may, for example, be needed to refresh webpages that have been modified "
+"since they were loaded, in order to make the changes visible."
+msgstr "重新装入当前显示的文档<p>例如,此功能可用于刷新自上次装入后修改过的网页,以便反映最新的变化。"
+
+#: konq_mainwindow.cc:1865 konq_mainwindow.cc:4041
+msgid "Reload the currently displayed document"
+msgstr "重新装入目前显示的文档"
+
+#: konq_mainwindow.cc:1959
msgid "Your sidebar is not functional or unavailable."
msgstr "您的侧边栏没有功能或不可用。"
-#: konq_mainwindow.cc:1865 konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1959 konq_mainwindow.cc:1978
msgid "Show History Sidebar"
msgstr "显示历史侧边栏"
-#: konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1978
msgid "Cannot find running history plugin in your sidebar."
msgstr "您的侧边栏中找不到运行中的历史插件。"
-#: konq_mainwindow.cc:2581 konq_mainwindow.cc:2599
+#: konq_mainwindow.cc:2672 konq_mainwindow.cc:2690
msgid ""
"This tab contains changes that have not been submitted.\n"
"Detaching the tab will discard these changes."
@@ -635,7 +663,7 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"漂移标签将会丢弃这些更改。"
-#: konq_mainwindow.cc:2703
+#: konq_mainwindow.cc:2802
msgid ""
"This view contains changes that have not been submitted.\n"
"Closing the view will discard these changes."
@@ -643,7 +671,7 @@ msgstr ""
"此视图包含尚未提交的更改。\n"
"关闭视图将会丢弃这些更改。"
-#: konq_mainwindow.cc:2719 konq_mainwindow.cc:2736
+#: konq_mainwindow.cc:2818 konq_mainwindow.cc:2835
msgid ""
"This tab contains changes that have not been submitted.\n"
"Closing the tab will discard these changes."
@@ -651,19 +679,19 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"关闭标签将会丢弃这些更改。"
-#: konq_mainwindow.cc:2758
+#: konq_mainwindow.cc:2857
msgid "Do you really want to close all other tabs?"
msgstr "您确定想要关闭全部其它标签吗?"
-#: konq_mainwindow.cc:2759
+#: konq_mainwindow.cc:2858
msgid "Close Other Tabs Confirmation"
msgstr "关闭其它标签确认"
-#: konq_mainwindow.cc:2759 konq_mainwindow.cc:3803 konq_tabs.cc:421
+#: konq_mainwindow.cc:2858 konq_mainwindow.cc:3904 konq_tabs.cc:496
msgid "Close &Other Tabs"
msgstr "关闭其它标签(&O)"
-#: konq_mainwindow.cc:2773
+#: konq_mainwindow.cc:2872
msgid ""
"This tab contains changes that have not been submitted.\n"
"Closing other tabs will discard these changes."
@@ -671,7 +699,7 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"关闭其它标签将会丢弃这些更改。"
-#: konq_mainwindow.cc:2806
+#: konq_mainwindow.cc:2905
msgid ""
"This tab contains changes that have not been submitted.\n"
"Reloading all tabs will discard these changes."
@@ -679,324 +707,319 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"重新装入全部标签将会丢弃这些更改。"
-#: konq_mainwindow.cc:2878
+#: konq_mainwindow.cc:2977
#, c-format
msgid "No permissions to write to %1"
msgstr "没有写入 %1 的权限"
-#: konq_mainwindow.cc:2888
+#: konq_mainwindow.cc:2987
msgid "Enter Target"
msgstr "输入目标"
-#: konq_mainwindow.cc:2897
+#: konq_mainwindow.cc:2996
msgid "<qt><b>%1</b> is not valid</qt>"
msgstr "<qt><b>%1</b> 是无效的</qt>"
-#: konq_mainwindow.cc:2913
+#: konq_mainwindow.cc:3012
msgid "Copy selected files from %1 to:"
msgstr "将选中文件从 %1 复制到:"
-#: konq_mainwindow.cc:2923
+#: konq_mainwindow.cc:3022
msgid "Move selected files from %1 to:"
msgstr "将选中文件从 %1 移动到:"
-#: konq_mainwindow.cc:3705
+#: konq_mainwindow.cc:3806
msgid "&Edit File Type..."
msgstr "编辑文件类型(&E)..."
-#: konq_mainwindow.cc:3707 sidebar/trees/history_module/history_module.cpp:78
+#: konq_mainwindow.cc:3808 sidebar/trees/history_module/history_module.cpp:78
msgid "New &Window"
msgstr "新建窗口(&W)"
-#: konq_mainwindow.cc:3708
+#: konq_mainwindow.cc:3809
msgid "&Duplicate Window"
msgstr "复制窗口(&D)"
-#: konq_mainwindow.cc:3709
+#: konq_mainwindow.cc:3810
msgid "Send &Link Address..."
msgstr "发送链接地址(&L)..."
-#: konq_mainwindow.cc:3710
+#: konq_mainwindow.cc:3811
msgid "S&end File..."
msgstr "发送文件(&E)..."
-#: konq_mainwindow.cc:3713
+#: konq_mainwindow.cc:3814
msgid "Open &Terminal"
msgstr "打开终端(&T)"
-#: konq_mainwindow.cc:3715
+#: konq_mainwindow.cc:3816
msgid "&Open Location..."
msgstr "打开位置(&O)..."
-#: konq_mainwindow.cc:3717
+#: konq_mainwindow.cc:3818
msgid "&Find File..."
msgstr "查找文件(&F)..."
-#: konq_mainwindow.cc:3722
+#: konq_mainwindow.cc:3823
msgid "&Use index.html"
msgstr "使用 index.html(&U)"
-#: konq_mainwindow.cc:3723
+#: konq_mainwindow.cc:3824
msgid "Lock to Current Location"
msgstr "锁定到当前位置"
-#: konq_mainwindow.cc:3724
+#: konq_mainwindow.cc:3825
msgid "Lin&k View"
msgstr "链接视图(&K)"
-#: konq_mainwindow.cc:3727
+#: konq_mainwindow.cc:3828
msgid "&Up"
msgstr "向上(&U)"
-#: konq_mainwindow.cc:3746 konq_mainwindow.cc:3765
+#: konq_mainwindow.cc:3847 konq_mainwindow.cc:3866
msgid "History"
msgstr "历史"
-#: konq_mainwindow.cc:3750
+#: konq_mainwindow.cc:3851
msgid "Home"
msgstr "主页"
-#: konq_mainwindow.cc:3754
+#: konq_mainwindow.cc:3855
msgid "S&ystem"
msgstr "系统(&Y)"
-#: konq_mainwindow.cc:3755
+#: konq_mainwindow.cc:3856
msgid "App&lications"
msgstr "应用程序(&L)"
-#: konq_mainwindow.cc:3756
+#: konq_mainwindow.cc:3857
msgid "&Storage Media"
msgstr "存储介质(&S)"
-#: konq_mainwindow.cc:3757
+#: konq_mainwindow.cc:3858
msgid "&Network Folders"
msgstr "网络文件夹(&N)"
-#: konq_mainwindow.cc:3758
+#: konq_mainwindow.cc:3859
msgid "Sett&ings"
msgstr "设置(&I)"
-#: about/konq_aboutpage.cc:136 konq_mainwindow.cc:3760
+#: about/konq_aboutpage.cc:163 konq_mainwindow.cc:3861
msgid "Trash"
msgstr "回收站"
-#: konq_mainwindow.cc:3761
+#: konq_mainwindow.cc:3862
msgid "Autostart"
msgstr "自动启动"
-#: konq_mainwindow.cc:3762
+#: konq_mainwindow.cc:3863
msgid "Most Often Visited"
msgstr "最经常访问的"
-#: konq_mainwindow.cc:3769 konq_mainwindow.cc:4335
+#: konq_mainwindow.cc:3870 konq_mainwindow.cc:4422
msgid "&Save View Profile..."
msgstr "保存视图配置文件(&S)..."
-#: konq_mainwindow.cc:3770
+#: konq_mainwindow.cc:3871
msgid "Save View Changes per &Folder"
msgstr "为每个文件夹保存视图更改(&F)"
-#: konq_mainwindow.cc:3772
+#: konq_mainwindow.cc:3873
msgid "Remove Folder Properties"
msgstr "删除文件夹属性"
-#: konq_mainwindow.cc:3792
+#: konq_mainwindow.cc:3893
msgid "Configure Extensions..."
msgstr "配置扩展..."
-#: konq_mainwindow.cc:3793
+#: konq_mainwindow.cc:3894
msgid "Configure Spell Checking..."
msgstr "配置拼写检查..."
-#: konq_mainwindow.cc:3796
+#: konq_mainwindow.cc:3897
msgid "Split View &Left/Right"
msgstr "垂直拆分视图(&L)"
-#: konq_mainwindow.cc:3797
+#: konq_mainwindow.cc:3898
msgid "Split View &Top/Bottom"
msgstr "水平拆分视图(&T)"
-#: konq_mainwindow.cc:3798 konq_tabs.cc:84
+#: konq_mainwindow.cc:3899 konq_tabs.cc:93
msgid "&New Tab"
msgstr "新建标签(&N)"
-#: konq_mainwindow.cc:3799
+#: konq_mainwindow.cc:3900
msgid "&Duplicate Current Tab"
msgstr "复制当前标签(&D)"
-#: konq_mainwindow.cc:3800
+#: konq_mainwindow.cc:3901
msgid "Detach Current Tab"
msgstr "漂移当前标签"
-#: konq_mainwindow.cc:3801
+#: konq_mainwindow.cc:3902
msgid "&Close Active View"
msgstr "关闭活动视图(&C)"
-#: konq_mainwindow.cc:3802
+#: konq_mainwindow.cc:3903
msgid "Close Current Tab"
msgstr "关闭当前标签"
-#: konq_mainwindow.cc:3805
+#: konq_mainwindow.cc:3906
msgid "Activate Next Tab"
msgstr "激活下一标签"
-#: konq_mainwindow.cc:3806
+#: konq_mainwindow.cc:3907
msgid "Activate Previous Tab"
msgstr "激活上一标签"
-#: konq_mainwindow.cc:3811
+#: konq_mainwindow.cc:3912
#, c-format
msgid "Activate Tab %1"
msgstr "激活第 %1 个标签"
-#: konq_mainwindow.cc:3814
+#: konq_mainwindow.cc:3915
msgid "Move Tab Left"
msgstr "向左移动标签"
-#: konq_mainwindow.cc:3815
+#: konq_mainwindow.cc:3916
msgid "Move Tab Right"
msgstr "向右移动标签"
-#: konq_mainwindow.cc:3818
+#: konq_mainwindow.cc:3919
msgid "Dump Debug Info"
msgstr "转存调试信息"
-#: konq_mainwindow.cc:3821
+#: konq_mainwindow.cc:3922
msgid "C&onfigure View Profiles..."
msgstr "配置视图配置文件(&O)..."
-#: konq_mainwindow.cc:3822
+#: konq_mainwindow.cc:3923
msgid "Load &View Profile"
msgstr "装入视图配置文件(&V)"
-#: konq_mainwindow.cc:3835 konq_tabs.cc:399
+#: konq_mainwindow.cc:3936 konq_tabs.cc:474
msgid "&Reload All Tabs"
msgstr "刷新全部标签(&R)"
-#: konq_mainwindow.cc:3850
+#: konq_mainwindow.cc:3938
+#, fuzzy
+msgid "&Reload/Stop"
+msgstr "刷新标签(&R)"
+
+#: konq_mainwindow.cc:3953
msgid "&Stop"
msgstr "停止(&S)"
-#: konq_mainwindow.cc:3852
+#: konq_mainwindow.cc:3955
msgid "&Rename"
msgstr "重命名(&R)"
-#: konq_mainwindow.cc:3853
+#: konq_mainwindow.cc:3956
msgid "&Move to Trash"
msgstr "移动到回收站(&M)"
-#: konq_mainwindow.cc:3859
+#: konq_mainwindow.cc:3962
+msgid "Copy &Files..."
+msgstr "复制文件(&F)..."
+
+#: konq_mainwindow.cc:3963
+msgid "M&ove Files..."
+msgstr "移动文件(&O)..."
+
+#: konq_mainwindow.cc:3965
+msgid "Create Folder..."
+msgstr "创建文件夹..."
+
+#: konq_mainwindow.cc:3966
msgid "Animated Logo"
msgstr "动画标志"
-#: konq_mainwindow.cc:3862 konq_mainwindow.cc:3863
+#: konq_mainwindow.cc:3969 konq_mainwindow.cc:3970
msgid "L&ocation: "
msgstr "位置(&O):"
-#: konq_mainwindow.cc:3866
+#: konq_mainwindow.cc:3973
msgid "Location Bar"
msgstr "位置栏"
-#: konq_mainwindow.cc:3871
+#: konq_mainwindow.cc:3978
msgid "Location Bar<p>Enter a web address or search term."
msgstr "位置栏<p>输入网页位置或者搜索词条。"
-#: konq_mainwindow.cc:3874
+#: konq_mainwindow.cc:3981
msgid "Clear Location Bar"
msgstr "清除位置栏"
-#: konq_mainwindow.cc:3879
+#: konq_mainwindow.cc:3986
msgid "Clear Location bar<p>Clears the content of the location bar."
msgstr "清除位置栏<p>清除位置栏中的内容。"
-#: konq_mainwindow.cc:3902
+#: konq_mainwindow.cc:4009
msgid "Bookmark This Location"
msgstr "将此位置添加为书签"
-#: konq_mainwindow.cc:3906
+#: konq_mainwindow.cc:4013
msgid "Kon&queror Introduction"
msgstr "Konqueror 介绍(&Q)"
-#: konq_mainwindow.cc:3908
+#: konq_mainwindow.cc:4015
msgid "Go"
msgstr "转到"
-#: konq_mainwindow.cc:3909
+#: konq_mainwindow.cc:4016
msgid "Go<p>Goes to the page that has been entered into the location bar."
msgstr "转到<p>转到在位置栏中输入的位置所指定的页面。"
-#: konq_mainwindow.cc:3915
+#: konq_mainwindow.cc:4022
msgid ""
"Enter the parent folder"
"<p>For instance, if the current location is file:/home/%1 clicking this button "
"will take you to file:/home."
msgstr "进入父文件夹<p>例如,如果当前位置是 file:/home/%1,单击此按钮将进入 file:/home。"
-#: konq_mainwindow.cc:3918
+#: konq_mainwindow.cc:4025
msgid "Enter the parent folder"
msgstr "进入父文件夹"
-#: konq_mainwindow.cc:3920
+#: konq_mainwindow.cc:4027
msgid "Move backwards one step in the browsing history<p>"
msgstr "在浏览历史中向后退一步<p>"
-#: konq_mainwindow.cc:3921
+#: konq_mainwindow.cc:4028
msgid "Move backwards one step in the browsing history"
msgstr "在浏览历史中向后退一步"
-#: konq_mainwindow.cc:3923
+#: konq_mainwindow.cc:4030
msgid "Move forward one step in the browsing history<p>"
msgstr "在浏览历史中向前进一步<p>"
-#: konq_mainwindow.cc:3924
+#: konq_mainwindow.cc:4031
msgid "Move forward one step in the browsing history"
msgstr "在浏览历史中向后退一步"
-#: konq_mainwindow.cc:3926
+#: konq_mainwindow.cc:4033
msgid ""
"Navigate to your 'Home Location'"
"<p>You can configure the location this button takes you to in the <b>"
"Trinity Control Center</b>, under <b>File Manager</b>/<b>Behavior</b>."
msgstr "前往您的“主页”<p>您可以在<b>TDE 控制中心</b>的<b>文件管理器</b>/<b>行为</b>中配置此按钮将带您前往的位置。"
-#: konq_mainwindow.cc:3929
+#: konq_mainwindow.cc:4036
msgid "Navigate to your 'Home Location'"
msgstr "前往您的“主页”"
-#: konq_mainwindow.cc:3931
-msgid ""
-"Reload the currently displayed document"
-"<p>This may, for example, be needed to refresh webpages that have been modified "
-"since they were loaded, in order to make the changes visible."
-msgstr "重新装入当前显示的文档<p>例如,此功能可用于刷新自上次装入后修改过的网页,以便反映最新的变化。"
-
-#: konq_mainwindow.cc:3934
-msgid "Reload the currently displayed document"
-msgstr "重新装入目前显示的文档"
-
-#: konq_mainwindow.cc:3936
+#: konq_mainwindow.cc:4043
msgid ""
"Reload all currently displayed documents in tabs"
"<p>This may, for example, be needed to refresh webpages that have been modified "
"since they were loaded, in order to make the changes visible."
msgstr "重新装入当前显示的文档<p>例如,此功能可用于刷新自上次装入后修改过的网页,以便反映最新的变化。"
-#: konq_mainwindow.cc:3939
+#: konq_mainwindow.cc:4046
msgid "Reload all currently displayed document in tabs"
msgstr "重新装入目前在标签中显示的文档"
-#: konq_mainwindow.cc:3941
-msgid ""
-"Stop loading the document"
-"<p>All network transfers will be stopped and Konqueror will display the content "
-"that has been received so far."
-msgstr "停止装入文档<p>所有网络传输都会停止,Konqueror 将显示已经接受到的文档内容。"
-
-#: konq_mainwindow.cc:3944
-msgid "Stop loading the document"
-msgstr "停止装入文件"
-
-#: konq_mainwindow.cc:3946
+#: konq_mainwindow.cc:4053
msgid ""
"Cut the currently selected text or item(s) and move it to the system clipboard"
"<p> This makes it available to the <b>Paste</b> command in Konqueror and other "
@@ -1005,32 +1028,32 @@ msgstr ""
"将当前选中的文字或项目剪切并移动到系统剪贴板中"
"<p>这使得您可以稍候在 Konqueror 和其它 TDE 应用程序中使用<b>粘贴</b>命令。"
-#: konq_mainwindow.cc:3950
+#: konq_mainwindow.cc:4057
msgid "Move the selected text or item(s) to the clipboard"
msgstr "将选中的文字或项目移动到剪贴板"
-#: konq_mainwindow.cc:3952
+#: konq_mainwindow.cc:4059
msgid ""
"Copy the currently selected text or item(s) to the system clipboard"
"<p>This makes it available to the <b>Paste</b> command in Konqueror and other "
"TDE applications."
msgstr "将当前选中的文字或项目复制到系统剪贴板中<p>这使得您可以稍候在 Konqueror 和其它 TDE 应用程序中使用<b>粘贴</b>命令。"
-#: konq_mainwindow.cc:3956
+#: konq_mainwindow.cc:4063
msgid "Copy the selected text or item(s) to the clipboard"
msgstr "将选中的文字或项目复制到剪贴板"
-#: konq_mainwindow.cc:3958
+#: konq_mainwindow.cc:4065
msgid ""
"Paste the previously cut or copied clipboard contents"
"<p>This also works for text copied or cut from other TDE applications."
msgstr "粘贴先前剪切或复制的剪贴板内容<p>这也适用于从其它 TDE 应用程序中复制或剪切的文字。"
-#: konq_mainwindow.cc:3961
+#: konq_mainwindow.cc:4068
msgid "Paste the clipboard contents"
msgstr "粘贴剪贴板内容"
-#: konq_mainwindow.cc:3963
+#: konq_mainwindow.cc:4070
msgid ""
"Print the currently displayed document"
"<p>You will be presented with a dialog where you can set various options, such "
@@ -1042,107 +1065,106 @@ msgstr ""
"<p>选择此功能后将出现一个对话框,其中您可以设置各种选项,如打印副本的数量和要使用的打印机。"
"<p>此对话框也可访问特殊的 TDE 打印服务,如从当前文档创建 PDF 文件。"
-#: konq_mainwindow.cc:3969
+#: konq_mainwindow.cc:4076
msgid "Print the current document"
msgstr "打印当前文档"
-#: konq_mainwindow.cc:3975
+#: konq_mainwindow.cc:4082
msgid "If present, open index.html when entering a folder."
msgstr "在进入文件夹时,如果存在 index.html 则打开它。"
-#: konq_mainwindow.cc:3976
+#: konq_mainwindow.cc:4083
msgid ""
"A locked view cannot change folders. Use in combination with 'link view' to "
"explore many files from one folder"
msgstr "一个锁定的视图不能更改文件夹。请和“链接视图”一起使用来从一个文件夹中查看多个文件"
-#: konq_mainwindow.cc:3977
+#: konq_mainwindow.cc:4084
msgid ""
"Sets the view as 'linked'. A linked view follows folder changes made in other "
"linked views."
msgstr "设置视图为“被链接的”。一个被链接的视图随其它被链接的视图中文件夹的修改而更改。"
-#: konq_mainwindow.cc:4001
+#: konq_mainwindow.cc:4108
#: sidebar/trees/bookmark_module/bookmark_module.cpp:71
msgid "Open Folder in Tabs"
msgstr "在标签中打开文件夹"
-#: konq_mainwindow.cc:4006
+#: konq_mainwindow.cc:4113
#: sidebar/trees/bookmark_module/bookmark_module.cpp:67
-#: sidebar/trees/konq_sidebartree.cpp:913
+#: sidebar/trees/konq_sidebartree.cpp:924
msgid "Open in New Window"
msgstr "在新窗口中打开"
-#: konq_mainwindow.cc:4007
+#: konq_mainwindow.cc:4114
#: sidebar/trees/bookmark_module/bookmark_module.cpp:69
-#: sidebar/trees/konq_sidebartree.cpp:915
+#: sidebar/trees/konq_sidebartree.cpp:926
msgid "Open in New Tab"
msgstr "在新标签中打开"
-#: konq_mainwindow.cc:4175
-msgid "Copy &Files..."
-msgstr "复制文件(&F)..."
-
-#: konq_mainwindow.cc:4176
-msgid "M&ove Files..."
-msgstr "移动文件(&O)..."
-
-#: konq_mainwindow.cc:4180
-msgid "Create Folder..."
-msgstr "创建文件夹..."
-
-#: konq_mainwindow.cc:4334
+#: konq_mainwindow.cc:4421
msgid "&Save View Profile \"%1\"..."
msgstr "保存视图配置文件“%1”(&S)..."
-#: konq_mainwindow.cc:4674
+#: konq_mainwindow.cc:4762
msgid "Open in T&his Window"
msgstr "在此窗口中打开(&T)"
-#: konq_mainwindow.cc:4675
+#: konq_mainwindow.cc:4763
msgid "Open the document in current window"
msgstr "在当前窗口中打开文档"
-#: konq_mainwindow.cc:4677 sidebar/web_module/web_module.h:55
+#: konq_mainwindow.cc:4765 sidebar/web_module/web_module.h:55
#: sidebar/web_module/web_module.h:58
msgid "Open in New &Window"
msgstr "在新窗口中打开(&W)"
-#: konq_mainwindow.cc:4678
+#: konq_mainwindow.cc:4766
msgid "Open the document in a new window"
msgstr "在新窗口中打开文档"
-#: konq_mainwindow.cc:4688
+#: konq_mainwindow.cc:4776 konq_mainwindow.cc:4780
+#, fuzzy
+msgid "Open in &Background Tab"
+msgstr "在新建标签中打开(&N)"
+
+#: konq_mainwindow.cc:4777 konq_mainwindow.cc:4782
+#, fuzzy
+msgid "Open the document in a new background tab"
+msgstr "在新标签中打开文档"
+
+#: konq_mainwindow.cc:4778 konq_mainwindow.cc:4781
msgid "Open in &New Tab"
msgstr "在新建标签中打开(&N)"
-#: konq_mainwindow.cc:4689
-msgid "Open the document in a new tab"
+#: konq_mainwindow.cc:4779 konq_mainwindow.cc:4783
+#, fuzzy
+msgid "Open the document in a new foreground tab"
msgstr "在新标签中打开文档"
-#: konq_mainwindow.cc:4929
+#: konq_mainwindow.cc:5025
#, c-format
msgid "Open with %1"
msgstr "用 %1 打开"
-#: konq_mainwindow.cc:4986
+#: konq_mainwindow.cc:5082
msgid "&View Mode"
msgstr "视图模式(&V)"
-#: konq_mainwindow.cc:5196
+#: konq_mainwindow.cc:5291
msgid ""
"You have multiple tabs open in this window, are you sure you want to quit?"
msgstr "您在此窗口内有多个标签,您确定要关闭窗口吗?"
-#: konq_mainwindow.cc:5198 konq_viewmgr.cc:1147
+#: konq_mainwindow.cc:5293 konq_viewmgr.cc:1153
msgid "Confirmation"
msgstr "确认"
-#: konq_mainwindow.cc:5200
+#: konq_mainwindow.cc:5295
msgid "C&lose Current Tab"
msgstr "关闭当前标签(&L)"
-#: konq_mainwindow.cc:5232
+#: konq_mainwindow.cc:5327
msgid ""
"This tab contains changes that have not been submitted.\n"
"Closing the window will discard these changes."
@@ -1150,7 +1172,7 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"关闭窗口将会丢弃这些更改。"
-#: konq_mainwindow.cc:5250
+#: konq_mainwindow.cc:5345
msgid ""
"This page contains changes that have not been submitted.\n"
"Closing the window will discard these changes."
@@ -1158,20 +1180,20 @@ msgstr ""
"此页面包含尚未提交的更改。\n"
"关闭窗口将会丢弃这些更改。"
-#: konq_mainwindow.cc:5342
+#: konq_mainwindow.cc:5437
msgid ""
"Your sidebar is not functional or unavailable. A new entry cannot be added."
msgstr "您的侧边栏没有功能或不可用。新的项目无法被添加。"
-#: konq_mainwindow.cc:5342 konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5437 konq_mainwindow.cc:5444
msgid "Web Sidebar"
msgstr "Web 侧边栏"
-#: konq_mainwindow.cc:5347
+#: konq_mainwindow.cc:5442
msgid "Add new web extension \"%1\" to your sidebar?"
msgstr "要给您的侧边栏添加新的 Web 扩展“%1”吗?"
-#: konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5444
msgid "Do Not Add"
msgstr "不添加"
@@ -1199,7 +1221,7 @@ msgstr "在配置中保存 URL(&U)"
msgid "Save &window size in profile"
msgstr "在配置中保存窗口大小(&W)"
-#: konq_tabs.cc:65
+#: konq_tabs.cc:74
msgid ""
"This bar contains the list of currently open tabs. Click on a tab to make it "
"active. The option to show a close button instead of the website icon in the "
@@ -1211,31 +1233,41 @@ msgstr ""
"此栏包含目前打开的标签列表。单击标签可激活该标签。在标签左上角显示关闭按钮而非网站图标这一选项是可配置的。您还可以使用键盘快捷键在标签间导航。标签上的文字是该标"
"签所打开的网站标题,如果该标题太长以致无法完全显示下的话,将您的鼠标指向标签可查看完整标题。"
-#: konq_tabs.cc:89
+#: konq_tabs.cc:98
msgid "&Reload Tab"
msgstr "刷新标签(&R)"
-#: konq_tabs.cc:94
+#: konq_tabs.cc:103
msgid "&Duplicate Tab"
msgstr "复制标签(&D)"
-#: konq_tabs.cc:100
+#: konq_tabs.cc:109
msgid "D&etach Tab"
msgstr "漂移标签(&E)"
-#: konq_tabs.cc:107
+#: konq_tabs.cc:116
+#, fuzzy
+msgid "Move Tab &Left"
+msgstr "向左移动标签"
+
+#: konq_tabs.cc:122
+#, fuzzy
+msgid "Move Tab &Right"
+msgstr "向右移动标签"
+
+#: konq_tabs.cc:129
msgid "Other Tabs"
msgstr "其它标签"
-#: konq_tabs.cc:112
+#: konq_tabs.cc:134
msgid "&Close Tab"
msgstr "关闭标签(&C)"
-#: konq_tabs.cc:144
+#: konq_tabs.cc:166
msgid "Open a new tab"
msgstr "打开一个新标签"
-#: konq_tabs.cc:153
+#: konq_tabs.cc:175
msgid "Close the current tab"
msgstr "关闭当前标签"
@@ -1250,7 +1282,7 @@ msgstr "您试图查看的页面是表单数据提交的结果。如果您重新
msgid "Resend"
msgstr "重新发送"
-#: konq_viewmgr.cc:1145
+#: konq_viewmgr.cc:1151
msgid ""
"You have multiple tabs open in this window.\n"
"Loading a view profile will close them."
@@ -1258,11 +1290,11 @@ msgstr ""
"您在此窗口内打开了多个标签。\n"
"装入配置文件将会全部关闭。"
-#: konq_viewmgr.cc:1148
+#: konq_viewmgr.cc:1154
msgid "Load View Profile"
msgstr "装入视图配置文件"
-#: konq_viewmgr.cc:1164
+#: konq_viewmgr.cc:1170
msgid ""
"This tab contains changes that have not been submitted.\n"
"Loading a profile will discard these changes."
@@ -1270,7 +1302,7 @@ msgstr ""
"此标签包含尚未提交的更改。\n"
"装入配置文件将会丢弃这些更改。"
-#: konq_viewmgr.cc:1182
+#: konq_viewmgr.cc:1188
msgid ""
"This page contains changes that have not been submitted.\n"
"Loading a profile will discard these changes."
@@ -1278,107 +1310,111 @@ msgstr ""
"此页面包含尚未提交的更改。\n"
"装入配置文件将会丢弃这些更改。"
-#: iconview/konq_iconview.cc:212 listview/konq_listview.cc:674
+#: iconview/konq_iconview.cc:214 listview/konq_listview.cc:702
msgid "Show &Hidden Files"
msgstr "显示隐藏文件(&H)"
-#: iconview/konq_iconview.cc:215
+#: iconview/konq_iconview.cc:217
msgid "Toggle displaying of hidden dot files"
msgstr "切换显示隐藏的文件"
-#: iconview/konq_iconview.cc:217
+#: iconview/konq_iconview.cc:219
msgid "&Folder Icons Reflect Contents"
msgstr "文件夹图标反映内容(&F)"
-#: iconview/konq_iconview.cc:220
+#: iconview/konq_iconview.cc:222
+msgid "&Media Icons Reflect Free Space"
+msgstr ""
+
+#: iconview/konq_iconview.cc:225
msgid "&Preview"
msgstr "预览(&P)"
-#: iconview/konq_iconview.cc:222
+#: iconview/konq_iconview.cc:227
msgid "Enable Previews"
msgstr "启用预览"
-#: iconview/konq_iconview.cc:223
+#: iconview/konq_iconview.cc:228
msgid "Disable Previews"
msgstr "禁用预览"
-#: iconview/konq_iconview.cc:243
+#: iconview/konq_iconview.cc:248
msgid "Sound Files"
msgstr "声音文件"
-#: iconview/konq_iconview.cc:250
+#: iconview/konq_iconview.cc:255
msgid "By Name (Case Sensitive)"
msgstr "按名称(区分大小写)"
-#: iconview/konq_iconview.cc:251
+#: iconview/konq_iconview.cc:256
msgid "By Name (Case Insensitive)"
msgstr "按名称(不分大小写)"
-#: iconview/konq_iconview.cc:252
+#: iconview/konq_iconview.cc:257
msgid "By Size"
msgstr "按大小"
-#: iconview/konq_iconview.cc:253
+#: iconview/konq_iconview.cc:258
msgid "By Type"
msgstr "按类型"
-#: iconview/konq_iconview.cc:254
+#: iconview/konq_iconview.cc:259
msgid "By Date"
msgstr "按日期"
-#: iconview/konq_iconview.cc:279
+#: iconview/konq_iconview.cc:284
msgid "Folders First"
msgstr "文件夹在前"
-#: iconview/konq_iconview.cc:280
+#: iconview/konq_iconview.cc:285
msgid "Descending"
msgstr "降序"
-#: iconview/konq_iconview.cc:305 listview/konq_listview.cc:668
+#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:680
msgid "Se&lect..."
msgstr "选择(&L)..."
-#: iconview/konq_iconview.cc:307 listview/konq_listview.cc:669
+#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:681
msgid "Unselect..."
msgstr "取消选择..."
-#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:671
+#: iconview/konq_iconview.cc:315 listview/konq_listview.cc:683
msgid "Unselect All"
msgstr "全部不选"
-#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:672
+#: iconview/konq_iconview.cc:317 listview/konq_listview.cc:684
msgid "&Invert Selection"
msgstr "反转选择(&I)"
-#: iconview/konq_iconview.cc:316
+#: iconview/konq_iconview.cc:321
msgid "Allows selecting of file or folder items based on a given mask"
msgstr "允许按所给的通配符来选择文件或文件夹项"
-#: iconview/konq_iconview.cc:317
+#: iconview/konq_iconview.cc:322
msgid "Allows unselecting of file or folder items based on a given mask"
msgstr "允许按所给的通配符来取消选择文件或文件夹项"
-#: iconview/konq_iconview.cc:318
+#: iconview/konq_iconview.cc:323
msgid "Selects all items"
msgstr "选中全部项目"
-#: iconview/konq_iconview.cc:319
+#: iconview/konq_iconview.cc:324
msgid "Unselects all selected items"
msgstr "取消选中全部项目"
-#: iconview/konq_iconview.cc:320
+#: iconview/konq_iconview.cc:325
msgid "Inverts the current selection of items"
msgstr "反转当前选择的项目"
-#: iconview/konq_iconview.cc:524 listview/konq_listview.cc:370
+#: iconview/konq_iconview.cc:550 listview/konq_listview.cc:382
msgid "Select files:"
msgstr "选中文件:"
-#: iconview/konq_iconview.cc:551 listview/konq_listview.cc:401
+#: iconview/konq_iconview.cc:577 listview/konq_listview.cc:413
msgid "Unselect files:"
msgstr "不选文件:"
-#: iconview/konq_iconview.cc:755
+#: iconview/konq_iconview.cc:781
msgid ""
"You cannot drop any items in a directory in which you do not have write "
"permission"
@@ -1392,144 +1428,172 @@ msgstr "查看为(&A)"
msgid "Filename"
msgstr "文件名"
-#: listview/konq_listview.cc:267
+#: listview/konq_listview.cc:275
msgid "MimeType"
msgstr "MIME 类型"
-#: listview/konq_listview.cc:268
+#: listview/konq_listview.cc:276
msgid "Size"
msgstr "大小"
-#: listview/konq_listview.cc:269
+#: listview/konq_listview.cc:277
msgid "Modified"
msgstr "修改时间"
-#: listview/konq_listview.cc:270
+#: listview/konq_listview.cc:278
msgid "Accessed"
msgstr "访问时间"
-#: listview/konq_listview.cc:271
+#: listview/konq_listview.cc:279
msgid "Created"
msgstr "创建时间"
-#: listview/konq_listview.cc:272
+#: listview/konq_listview.cc:280
msgid "Permissions"
msgstr "权限"
-#: listview/konq_listview.cc:273
+#: listview/konq_listview.cc:281
msgid "Owner"
msgstr "属主"
-#: listview/konq_listview.cc:274
+#: listview/konq_listview.cc:282
msgid "Group"
msgstr "组"
-#: listview/konq_listview.cc:275
+#: listview/konq_listview.cc:283
msgid "Link"
msgstr "链接"
#: keditbookmarks/bookmarkinfo.cpp:196 keditbookmarks/listview.cpp:581
-#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:276
+#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:284
msgid "URL"
msgstr "URL"
-#: listview/konq_listview.cc:278
+#: listview/konq_listview.cc:286
msgid "File Type"
msgstr "文件类型"
-#: listview/konq_listview.cc:646
+#: listview/konq_listview.cc:658
msgid "Show &Modification Time"
msgstr "显示修改时间(&M)"
-#: listview/konq_listview.cc:647
+#: listview/konq_listview.cc:659
msgid "Hide &Modification Time"
msgstr "隐藏修改时间(&M)"
-#: listview/konq_listview.cc:648
+#: listview/konq_listview.cc:660
msgid "Show &File Type"
msgstr "显示文件类型(&F)"
-#: listview/konq_listview.cc:649
+#: listview/konq_listview.cc:661
msgid "Hide &File Type"
msgstr "隐藏文件类型(&F)"
-#: listview/konq_listview.cc:650
+#: listview/konq_listview.cc:662
msgid "Show MimeType"
msgstr "显示 MIME 类型"
-#: listview/konq_listview.cc:651
+#: listview/konq_listview.cc:663
msgid "Hide MimeType"
msgstr "隐藏 MIME 类型"
-#: listview/konq_listview.cc:652
+#: listview/konq_listview.cc:664
msgid "Show &Access Time"
msgstr "显示访问时间(&A)"
-#: listview/konq_listview.cc:653
+#: listview/konq_listview.cc:665
msgid "Hide &Access Time"
msgstr "隐藏访问时间(&A)"
-#: listview/konq_listview.cc:654
+#: listview/konq_listview.cc:666
msgid "Show &Creation Time"
msgstr "显示创建时间(&C)"
-#: listview/konq_listview.cc:655
+#: listview/konq_listview.cc:667
msgid "Hide &Creation Time"
msgstr "隐藏创建时间(&C)"
-#: listview/konq_listview.cc:656
+#: listview/konq_listview.cc:668
msgid "Show &Link Destination"
msgstr "显示链接目标(&L)"
-#: listview/konq_listview.cc:657
+#: listview/konq_listview.cc:669
msgid "Hide &Link Destination"
msgstr "隐藏链接目标(&L)"
-#: listview/konq_listview.cc:658
+#: listview/konq_listview.cc:670
msgid "Show Filesize"
msgstr "显示文件大小"
-#: listview/konq_listview.cc:659
+#: listview/konq_listview.cc:671
msgid "Hide Filesize"
msgstr "隐藏文件大小"
-#: listview/konq_listview.cc:660
+#: listview/konq_listview.cc:672
msgid "Show Owner"
msgstr "显示属主"
-#: listview/konq_listview.cc:661
+#: listview/konq_listview.cc:673
msgid "Hide Owner"
msgstr "隐藏属主"
-#: listview/konq_listview.cc:662
+#: listview/konq_listview.cc:674
msgid "Show Group"
msgstr "显示组"
-#: listview/konq_listview.cc:663
+#: listview/konq_listview.cc:675
msgid "Hide Group"
msgstr "隐藏组"
-#: listview/konq_listview.cc:664
+#: listview/konq_listview.cc:676
msgid "Show Permissions"
msgstr "显示权限"
-#: listview/konq_listview.cc:665
+#: listview/konq_listview.cc:677
msgid "Hide Permissions"
msgstr "隐藏权限"
-#: listview/konq_listview.cc:666
+#: listview/konq_listview.cc:678
msgid "Show URL"
msgstr "显示 URL"
-#: listview/konq_listview.cc:676
+#: listview/konq_listview.cc:689
+msgid "&Rename and move to next item"
+msgstr ""
+
+#: listview/konq_listview.cc:691
+msgid ""
+"Pressing this button completes the current rename operation,moves to the next "
+"item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:693
+msgid "Complete rename operation and move the next item"
+msgstr ""
+
+#: listview/konq_listview.cc:695
+msgid "&Rename and move to previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:697
+msgid ""
+"Pressing this button completes the current rename operation,moves to the "
+"previous item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:699
+msgid "Complete rename operation and move the previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:704
msgid "Case Insensitive Sort"
msgstr "不区分大小写排序"
-#: listview/konq_listviewwidget.cc:350 listview/konq_textviewwidget.cc:68
+#: listview/konq_listviewwidget.cc:355 listview/konq_textviewwidget.cc:68
msgid "Name"
msgstr "名称"
-#: listview/konq_listviewwidget.cc:909
+#: listview/konq_listviewwidget.cc:1060
msgid "You must take the file out of the trash before being able to use it."
msgstr "在使用回收站里面的文件之前您必须先将它移出去。"
@@ -1538,7 +1602,8 @@ msgid "Galeon"
msgstr "Galeon"
#: keditbookmarks/importers.h:118
-msgid "TDE"
+#, fuzzy
+msgid "KDE"
msgstr "TDE"
#: keditbookmarks/importers.h:139
@@ -1565,7 +1630,7 @@ msgstr "崩溃"
msgid "&Show Netscape Bookmarks in Konqueror"
msgstr "在 Konqueror 窗口中显示 Netscape 书签(&S)"
-#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:907
+#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:918
msgid "Rename"
msgstr "重命名"
@@ -1666,7 +1731,8 @@ msgid "Import &Galeon Bookmarks..."
msgstr "导入 Galeon 书签(&G)..."
#: keditbookmarks/actionsimpl.cpp:190
-msgid "Import &TDE2/TDE3 Bookmarks..."
+#, fuzzy
+msgid "Import &KDE2/KDE3 Bookmarks..."
msgstr "导入 TDE2/TDE3 书签(&K)..."
#: keditbookmarks/actionsimpl.cpp:193
@@ -1846,7 +1912,8 @@ msgid "*.xbel|Galeon Bookmark Files (*.xbel)"
msgstr "*.xbel|Galeon 书签文件(*.xbel)"
#: keditbookmarks/importers.cpp:188
-msgid "*.xml|TDE Bookmark Files (*.xml)"
+#, fuzzy
+msgid "*.xml|KDE Bookmark Files (*.xml)"
msgstr "*.xml|TDE 书签文件(*.xml)"
#: keditbookmarks/kbookmarkmerger.cpp:42
@@ -1975,7 +2042,8 @@ msgid "Konqueror Bookmarks Editor"
msgstr "Konqueror 书签编辑器"
#: keditbookmarks/main.cpp:120
-msgid "(c) 2000 - 2003, TDE developers"
+#, fuzzy
+msgid "(c) 2000 - 2003, KDE developers"
msgstr "(c) 2000 - 2003,TDE 开发者"
#: keditbookmarks/main.cpp:121
@@ -2016,128 +2084,129 @@ msgid ""
"<br>Resets the quick search so that all bookmarks are shown again."
msgstr "<b>重置快速搜索</b><br>重置快速搜索,以便显示全部书签。"
-#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:33
+#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:34
msgid "Se&arch:"
msgstr "搜索(&A):"
-#: about/konq_aboutpage.cc:112 about/konq_aboutpage.cc:114
-#: about/konq_aboutpage.cc:177 about/konq_aboutpage.cc:179
-#: about/konq_aboutpage.cc:232 about/konq_aboutpage.cc:234
-#: about/konq_aboutpage.cc:329 about/konq_aboutpage.cc:331
+#: about/konq_aboutpage.cc:139 about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:204 about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:259 about/konq_aboutpage.cc:261
+#: about/konq_aboutpage.cc:356 about/konq_aboutpage.cc:358
msgid "Conquer your Desktop!"
msgstr "征服您的桌面!"
-#: about/konq_aboutpage.cc:115 about/konq_aboutpage.cc:180
-#: about/konq_aboutpage.cc:235 about/konq_aboutpage.cc:332
+#: about/konq_aboutpage.cc:142 about/konq_aboutpage.cc:207
+#: about/konq_aboutpage.cc:262 about/konq_aboutpage.cc:359
msgid ""
"Konqueror is your file manager, web browser and universal document viewer."
msgstr "Konqueror 是您的文件管理器、Web 浏览器和通用文档查看器。"
-#: about/konq_aboutpage.cc:116 about/konq_aboutpage.cc:181
-#: about/konq_aboutpage.cc:236 about/konq_aboutpage.cc:333
+#: about/konq_aboutpage.cc:143 about/konq_aboutpage.cc:208
+#: about/konq_aboutpage.cc:263 about/konq_aboutpage.cc:360
msgid "Starting Points"
msgstr "起点"
-#: about/konq_aboutpage.cc:117 about/konq_aboutpage.cc:182
-#: about/konq_aboutpage.cc:237 about/konq_aboutpage.cc:334
+#: about/konq_aboutpage.cc:144 about/konq_aboutpage.cc:209
+#: about/konq_aboutpage.cc:264 about/konq_aboutpage.cc:361
msgid "Introduction"
msgstr "介绍"
-#: about/konq_aboutpage.cc:118 about/konq_aboutpage.cc:183
-#: about/konq_aboutpage.cc:238 about/konq_aboutpage.cc:335
+#: about/konq_aboutpage.cc:145 about/konq_aboutpage.cc:210
+#: about/konq_aboutpage.cc:265 about/konq_aboutpage.cc:362
msgid "Tips"
msgstr "提示"
-#: about/konq_aboutpage.cc:119 about/konq_aboutpage.cc:184
-#: about/konq_aboutpage.cc:239 about/konq_aboutpage.cc:240
-#: about/konq_aboutpage.cc:336
+#: about/konq_aboutpage.cc:146 about/konq_aboutpage.cc:211
+#: about/konq_aboutpage.cc:266 about/konq_aboutpage.cc:267
+#: about/konq_aboutpage.cc:363
msgid "Specifications"
msgstr "技术规范"
-#: about/konq_aboutpage.cc:125
+#: about/konq_aboutpage.cc:152
msgid "Your personal files"
msgstr "您的个人文件"
-#: about/konq_aboutpage.cc:128
+#: about/konq_aboutpage.cc:155
msgid "Storage Media"
msgstr "存储介质"
-#: about/konq_aboutpage.cc:129
+#: about/konq_aboutpage.cc:156
msgid "Disks and removable media"
msgstr "磁盘和可移动介质"
-#: about/konq_aboutpage.cc:132
+#: about/konq_aboutpage.cc:159
msgid "Network Folders"
msgstr "网络文件夹"
-#: about/konq_aboutpage.cc:133
+#: about/konq_aboutpage.cc:160
msgid "Shared files and folders"
msgstr "共享的文件和文件夹"
-#: about/konq_aboutpage.cc:137
+#: about/konq_aboutpage.cc:164
msgid "Browse and restore the trash"
msgstr "浏览并恢复回收站"
-#: about/konq_aboutpage.cc:140
+#: about/konq_aboutpage.cc:167
msgid "Applications"
msgstr "应用程序"
-#: about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:168
msgid "Installed programs"
msgstr "已安装的程序"
-#: about/konq_aboutpage.cc:144
+#: about/konq_aboutpage.cc:171
msgid "Settings"
msgstr "设置"
-#: about/konq_aboutpage.cc:145
+#: about/konq_aboutpage.cc:172
msgid "Desktop configuration"
msgstr "桌面配置"
-#: about/konq_aboutpage.cc:148
+#: about/konq_aboutpage.cc:175
msgid "Next: An Introduction to Konqueror"
msgstr "下一页:Konqueror 介绍"
-#: about/konq_aboutpage.cc:150
+#: about/konq_aboutpage.cc:177
msgid "Search the Web"
msgstr "搜索 Web"
-#: about/konq_aboutpage.cc:185
+#: about/konq_aboutpage.cc:212
msgid ""
"Konqueror makes working with and managing your files easy. You can browse both "
"local and networked folders while enjoying advanced features such as the "
"powerful sidebar and file previews."
msgstr "Konqueror 使得工作和管理文件从未如此容易。不管是本地还是网络文件夹,您都可尽享像强大的侧边栏及文件预览这样的高级特性。"
-#: about/konq_aboutpage.cc:189
+#: about/konq_aboutpage.cc:216
+#, fuzzy
msgid ""
"Konqueror is also a full featured and easy to use web browser which you can "
"use to explore the Internet. Enter the address (e.g. <a "
-"href=\"http://www.kde.org\">http://www.kde.org</A>) of a web page you would "
-"like to visit in the location bar and press Enter, or choose an entry from the "
-"Bookmarks menu."
+"href=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A>"
+") of a web page you would like to visit in the location bar and press Enter, or "
+"choose an entry from the Bookmarks menu."
msgstr ""
"Konqueror 还是一个全功能的 Web 浏览器。有它的日子,网上冲浪不再是一件枯燥的事情。只需在位置栏输入您要浏览的地址(例如 <a "
"href=\"http://www.kde.org\">http://www.kde.org</a>) 并按 Enter,或者选择书签菜单中的任何一项。"
-#: about/konq_aboutpage.cc:194
+#: about/konq_aboutpage.cc:221
msgid ""
"To return to the previous location, press the back button <img width='16' "
"height='16' src=\"%1\"> in the toolbar. "
msgstr "如果您要返回到上一个位置,请按工具栏中的后退按钮 <img width='16' height='16' src=\"%1\">。"
-#: about/konq_aboutpage.cc:197
+#: about/konq_aboutpage.cc:224
msgid ""
"To quickly go to your Home folder press the home button <img width='16' "
"height='16' src=\"%1\">."
msgstr "要快速返回到您的主文件夹,只需单击工具栏中的主文件夹按钮 <img width='16' height='16' src=\"%1\">。"
-#: about/konq_aboutpage.cc:199
+#: about/konq_aboutpage.cc:226
msgid ""
"For more detailed documentation on Konqueror click <a href=\"%1\">here</a>."
msgstr "如果需要有关 Konqueror 更详细的文档,请点击<a href=\"%1\">此处</a>。"
-#: about/konq_aboutpage.cc:201
+#: about/konq_aboutpage.cc:228
msgid ""
"<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, you "
"can turn off this information screen by clicking <a href=\"%1\">here</a>"
@@ -2147,11 +2216,11 @@ msgstr ""
"<i>调整提示:</i>如果您希望 Konqueror Web 浏览器启动更快一些,您可以单击<a href=\"%1\">此处</a>"
"来关闭此信息。如果您想要重新启用它,请选择帮助->Konqueror 介绍菜单选项,然后按设置->保存视图配置“Web 浏览”。"
-#: about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:233
msgid "Next: Tips &amp; Tricks"
msgstr "下一页:技巧"
-#: about/konq_aboutpage.cc:241
+#: about/konq_aboutpage.cc:268
msgid ""
"Konqueror is designed to embrace and support Internet standards. The aim is to "
"fully implement the officially sanctioned standards from organizations such as "
@@ -2164,54 +2233,54 @@ msgstr ""
"这样的组织正式批准的标准,同时也加入了被作为 Internet 事实标准的其它常用特性的支持。除了支持常用图标、Internet 关键字和 <a "
"href=\"%1\">XBEL 书签</a>等,Konqueror 也实现了:"
-#: about/konq_aboutpage.cc:248
+#: about/konq_aboutpage.cc:275
msgid "Web Browsing"
msgstr "Web 浏览"
-#: about/konq_aboutpage.cc:249
+#: about/konq_aboutpage.cc:276
msgid "Supported standards"
msgstr "支持的标准"
-#: about/konq_aboutpage.cc:250
+#: about/konq_aboutpage.cc:277
msgid "Additional requirements*"
msgstr "其它需求*"
-#: about/konq_aboutpage.cc:251
+#: about/konq_aboutpage.cc:278
msgid ""
"<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A HREF=\"%2\">"
"HTML 4.01</A>"
msgstr "基于 <A HREF=\"%1\">DOM</A>(第1级,部分的第2级)的 <A HREF=\"%2\">HTML 4.01</A>"
-#: about/konq_aboutpage.cc:253 about/konq_aboutpage.cc:255
-#: about/konq_aboutpage.cc:267 about/konq_aboutpage.cc:272
-#: about/konq_aboutpage.cc:274
+#: about/konq_aboutpage.cc:280 about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:294 about/konq_aboutpage.cc:299
+#: about/konq_aboutpage.cc:301
msgid "built-in"
msgstr "内建"
-#: about/konq_aboutpage.cc:254
+#: about/konq_aboutpage.cc:281
msgid "<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)"
msgstr "<A HREF=\"%1\">层叠样式表</A>(CSS 1,部分的 CSS 2)"
-#: about/konq_aboutpage.cc:256
+#: about/konq_aboutpage.cc:283
msgid "<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)"
msgstr "<A HREF=\"%1\">ECMA-262</A> 第3版(基本相当于 JavaScript 1.5)"
-#: about/konq_aboutpage.cc:257
+#: about/konq_aboutpage.cc:284
msgid ""
"JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>."
msgstr "已禁用 JavaScript(全局)。在<A HREF=\"%1\">这里</A>启用 JavasSript。"
-#: about/konq_aboutpage.cc:258
+#: about/konq_aboutpage.cc:285
msgid ""
"JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>"
"."
msgstr "已启用 JavaScript (全局)。在<A HREF=\\\"%1\\\">这里</A>配置 Javascript。"
-#: about/konq_aboutpage.cc:259
+#: about/konq_aboutpage.cc:286
msgid "Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support"
msgstr "安全的 <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> 支持"
-#: about/konq_aboutpage.cc:260
+#: about/konq_aboutpage.cc:287
msgid ""
"JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">"
"IBM</A> or <A HREF=\"%3\">Sun</A>)"
@@ -2219,11 +2288,11 @@ msgstr ""
"JDK 1.2.0 (Java 2) 兼容的虚拟机(<A HREF=\"%1\">Blackdown</A>,<A HREF=\"%2\">IBM</A>"
",或<A HREF=\"%3\">Sun</A>)"
-#: about/konq_aboutpage.cc:262
+#: about/konq_aboutpage.cc:289
msgid "Enable Java (globally) <A HREF=\"%1\">here</A>."
msgstr "在<A HREF=\"%1\">这里</A>启用 Java (全局)。"
-#: about/konq_aboutpage.cc:263
+#: about/konq_aboutpage.cc:290
msgid ""
"Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> "
"(for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>"
@@ -2233,96 +2302,97 @@ msgstr ""
"Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>"
"音频, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>视频等文件)"
-#: about/konq_aboutpage.cc:268
+#: about/konq_aboutpage.cc:295
msgid "Secure Sockets Layer"
msgstr "安全套接字层"
-#: about/konq_aboutpage.cc:269
+#: about/konq_aboutpage.cc:296
msgid "(TLS/SSL v2/3) for secure communications up to 168bit"
msgstr "(TLS/SSL v2/3) 达到 168 位强度的安全通信"
-#: about/konq_aboutpage.cc:270
+#: about/konq_aboutpage.cc:297
msgid "OpenSSL"
msgstr "OpenSSL"
-#: about/konq_aboutpage.cc:271
+#: about/konq_aboutpage.cc:298
msgid "Bidirectional 16bit unicode support"
msgstr "双向语言的 16 位 Unicode 支持"
-#: about/konq_aboutpage.cc:273
+#: about/konq_aboutpage.cc:300
msgid "AutoCompletion for forms"
msgstr "表单自动补全"
-#: about/konq_aboutpage.cc:275
+#: about/konq_aboutpage.cc:302
msgid "G E N E R A L"
msgstr "常 规"
-#: about/konq_aboutpage.cc:276
+#: about/konq_aboutpage.cc:303
msgid "Feature"
msgstr "特性"
-#: about/konq_aboutpage.cc:278
+#: about/konq_aboutpage.cc:305
msgid "Image formats"
msgstr "图像格式"
-#: about/konq_aboutpage.cc:279
+#: about/konq_aboutpage.cc:306
msgid "Transfer protocols"
msgstr "传输协议"
-#: about/konq_aboutpage.cc:280
+#: about/konq_aboutpage.cc:307
msgid "HTTP 1.1 (including gzip/bzip2 compression)"
msgstr "HTTP 1.1 (包括 gzip/bzip2 压缩)"
-#: about/konq_aboutpage.cc:281
+#: about/konq_aboutpage.cc:308
msgid "FTP"
msgstr "FTP"
-#: about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:309
msgid "and <A HREF=\"%1\">many more...</A>"
msgstr "和 <A HREF=\"%1\">其它很多...</A>"
-#: about/konq_aboutpage.cc:283
+#: about/konq_aboutpage.cc:310
msgid "URL-Completion"
msgstr "URL 补全"
-#: about/konq_aboutpage.cc:284
+#: about/konq_aboutpage.cc:311
msgid "Manual"
msgstr "手册"
-#: about/konq_aboutpage.cc:285
+#: about/konq_aboutpage.cc:312
msgid "Popup"
msgstr "弹出菜单"
-#: about/konq_aboutpage.cc:286
+#: about/konq_aboutpage.cc:313
msgid "(Short-) Automatic"
msgstr "(快捷-) 自动"
-#: about/konq_aboutpage.cc:288
+#: about/konq_aboutpage.cc:315
msgid "<a href=\"%1\">Return to Starting Points</a>"
msgstr "<a href=\"%1\">返回到起点</a>"
-#: about/konq_aboutpage.cc:337
+#: about/konq_aboutpage.cc:364
msgid "Tips &amp; Tricks"
msgstr "技巧"
-#: about/konq_aboutpage.cc:338
+#: about/konq_aboutpage.cc:365
+#, fuzzy
msgid ""
-"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: TDE\" one can search "
-"the Internet, using Google, for the search phrase \"TDE\". There are a lot of "
-"Web-Shortcuts predefined to make searching for software or looking up certain "
-"words in an encyclopedia a breeze. You can even <a href=\"%1\">"
-"create your own</a> Web-Shortcuts."
+"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: Trinity Desktop\" one "
+"can search the Internet, using Google, for the search phrase \"Trinity "
+"Desktop\". There are a lot of Web-Shortcuts predefined to make searching for "
+"software or looking up certain words in an encyclopedia a breeze. You can even "
+"<a href=\"%1\">create your own</a> Web-Shortcuts."
msgstr ""
"请使用 Internet 关键字和速搜:通过键入“gg: TDE”,可以使用 Google 在 Internet "
"上搜索“TDE”。有很多预定义的速搜使搜索软件或在百科全书中查找某些词变得轻而易举。您甚至可以<a href=\"%1\">创建您自己的</a>速搜。"
-#: about/konq_aboutpage.cc:343
+#: about/konq_aboutpage.cc:370
msgid ""
"Use the magnifier button <img width='16' height='16' src=\"%1\"> "
"in the toolbar to increase the font size on your web page."
msgstr "使用工具栏中的放大镜按钮 <img width='16' height='16' src=\"%1\"> 来增大网页中的字体大小。"
-#: about/konq_aboutpage.cc:345
+#: about/konq_aboutpage.cc:372
msgid ""
"When you want to paste a new address into the Location toolbar you might want "
"to clear the current entry by pressing the black arrow with the white cross "
@@ -2331,14 +2401,14 @@ msgstr ""
"当您希望在位置工具栏中粘贴新地址时,您也许希望用工具栏中的白十字黑箭头 <img width='16' height='16' src=\"%1\"> "
"来清除当前的地址。"
-#: about/konq_aboutpage.cc:349
+#: about/konq_aboutpage.cc:376
msgid ""
"To create a link on your desktop pointing to the current page, simply drag the "
"\"Location\" label that is to the left of the Location toolbar, drop it on to "
"the desktop, and choose \"Link\"."
msgstr "如果要在桌面上创建指向当前页面的链接,只需将位置工具栏左侧的“位置”标签拖放到桌面上,并选择“链接”。"
-#: about/konq_aboutpage.cc:352
+#: about/konq_aboutpage.cc:379
msgid ""
"You can also find <img width='16' height='16' src=\"%1\"> "
"\"Full-Screen Mode\" in the Settings menu. This feature is very useful for "
@@ -2346,7 +2416,7 @@ msgid ""
msgstr ""
"您也可以在窗口菜单中找到 <img width='16' height='16' src=\"%1\">“全屏幕模式”。该特性对“talk”会话非常有用。"
-#: about/konq_aboutpage.cc:355
+#: about/konq_aboutpage.cc:382
msgid ""
"Divide et impera (lat. \"Divide and conquer\") - by splitting a window into two "
"parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> "
@@ -2358,25 +2428,25 @@ msgstr ""
"将视图左右分开), 您可以使 Konqueror 象您希望的那样。您甚至可以装入一些视图配置示例(例如 Midnight "
"Commander),或者创建您自己的配置。"
-#: about/konq_aboutpage.cc:360
+#: about/konq_aboutpage.cc:387
msgid ""
"Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
"asks you to use a different browser (and do not forget to send a complaint to "
"the webmaster!)"
msgstr "如果您正在访问的网站要求您使用另外的浏览器,您可以使用<a href=\"%1\">用户代理</a>特性 (并且不要忘记向网站管理者抱怨!)"
-#: about/konq_aboutpage.cc:363
+#: about/konq_aboutpage.cc:390
msgid ""
"The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
"that you can keep track of the pages you have visited recently."
msgstr "工具条中的历史功能 <img width='16' height='16' src=\"%1\"> 使您能够跟踪您最近访问的页面。"
-#: about/konq_aboutpage.cc:365
+#: about/konq_aboutpage.cc:392
msgid ""
"Use a caching <a href=\"%1\">proxy</a> to speed up your Internet connection."
msgstr "使用缓冲<a href=\"%1\">代理服务器</a>来加速您的网络连接。"
-#: about/konq_aboutpage.cc:367
+#: about/konq_aboutpage.cc:394
msgid ""
"Advanced users will appreciate the Konsole which you can embed into Konqueror "
"(Window -> <img width='16' height='16' SRC=\"%1\"> Show Terminal Emulator)."
@@ -2384,50 +2454,50 @@ msgstr ""
"高级用户将喜欢 Konsole,您可以将它嵌入 Konqueror (窗口 -> <img width='16' height='16' src=\"%1\"> "
"显示终端仿真器)。"
-#: about/konq_aboutpage.cc:370
+#: about/konq_aboutpage.cc:397
msgid ""
"Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror "
"using a script."
msgstr "借助于 <a href=\"%1\">DCOP</a>,您可以使用脚本来完全控制 Konqueror。"
-#: about/konq_aboutpage.cc:372
+#: about/konq_aboutpage.cc:399
msgid "<img width='16' height='16' src=\"%1\">"
msgstr "<img width='16' height='16' src=\"%1\">"
-#: about/konq_aboutpage.cc:373
+#: about/konq_aboutpage.cc:400
msgid "Next: Specifications"
msgstr "下一页:技术规范"
-#: about/konq_aboutpage.cc:389
+#: about/konq_aboutpage.cc:416
msgid "Installed Plugins"
msgstr "已安装的插件"
-#: about/konq_aboutpage.cc:390
+#: about/konq_aboutpage.cc:417
msgid "<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"
msgstr "<td>插件</td><td>描述</td><td>文件</td><td>类型</td>"
-#: about/konq_aboutpage.cc:391
+#: about/konq_aboutpage.cc:418
msgid "Installed"
msgstr "已安装"
-#: about/konq_aboutpage.cc:392
+#: about/konq_aboutpage.cc:419
msgid "<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"
msgstr "<td>MIME 类型</td><td>描述</td><td>后缀</td><td>插件</td>"
-#: about/konq_aboutpage.cc:498
+#: about/konq_aboutpage.cc:538
msgid ""
"Do you want to disable showing the introduction in the webbrowsing profile?"
msgstr "您要在网页浏览配置中禁止显示介绍吗?"
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
msgid "Faster Startup?"
msgstr "快速启动?"
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
msgid "Disable"
msgstr "禁用"
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
msgid "Keep"
msgstr "保留"
@@ -2459,52 +2529,63 @@ msgstr "在当前目录中执行 Shell 命令:"
msgid "Output from command: \"%1\""
msgstr "命令输出:“%1”"
-#: sidebar/trees/konqsidebar_tree.cpp:31
+#: sidebar/trees/konqsidebar_tree.cpp:32
msgid "Clear Search"
msgstr "清除搜索"
-#: sidebar/trees/konqsidebar_tree.cpp:146
+#: sidebar/trees/konqsidebar_tree.cpp:147
msgid "Select Type"
msgstr "选择类型"
-#: sidebar/trees/konqsidebar_tree.cpp:147
+#: sidebar/trees/konqsidebar_tree.cpp:148
msgid "Select type:"
msgstr "选择类型:"
-#: sidebar/trees/history_module/history_module.cpp:80
-msgid "&Remove Entry"
-msgstr "删除项目(&R)"
-
-#: sidebar/trees/history_module/history_module.cpp:82
-msgid "C&lear History"
-msgstr "清除历史(&L)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
+msgid "&Create New Folder"
+msgstr "创建新文件夹(&C)"
-#: sidebar/trees/history_module/history_module.cpp:88
-msgid "By &Name"
-msgstr "按名称(&N)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
+#: sidebar/trees/konq_sidebartree.cpp:916
+msgid "Delete Folder"
+msgstr "删除文件夹"
-#: sidebar/trees/history_module/history_module.cpp:93
-msgid "By &Date"
-msgstr "按日期(&D)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
+msgid "Delete Bookmark"
+msgstr "删除书签"
-#: sidebar/trees/history_module/history_module.cpp:351
-#: sidebar/trees/history_module/kcmhistory.cpp:263
-msgid "Do you really want to clear the entire history?"
-msgstr "您确定想要清空全部历史吗?"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
+#: sidebar/trees/konq_sidebartree.cpp:928
+msgid "Copy Link Address"
+msgstr "复制链接地址"
-#: sidebar/trees/history_module/history_module.cpp:353
-#: sidebar/trees/history_module/kcmhistory.cpp:265
-msgid "Clear History?"
-msgstr "清除历史吗?"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
+msgid ""
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签文件夹\n"
+"“%1”吗?"
-#: sidebar/trees/history_module/history_item.cpp:121
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
msgid ""
-"<qt>"
-"<center><b>%4</b></center>"
-"<hr>Last visited: %1"
-"<br>First visited: %2"
-"<br>Number of times visited: %3</qt>"
-msgstr "<qt><center><b>%4</b></center><hr>第一次访问:%2<br>最后访问:%1<br>访问次数:%3</qt>"
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签\n"
+"“%1”吗?"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
+msgid "Bookmark Folder Deletion"
+msgstr "书签文件夹删除"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
+msgid "Bookmark Deletion"
+msgstr "书签删除"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
+msgid "Bookmark Properties"
+msgstr "书签属性"
#: sidebar/trees/history_module/kcmhistory.cpp:68
#: sidebar/trees/history_module/kcmhistory.cpp:73
@@ -2540,162 +2621,147 @@ msgid ""
"Minutes"
msgstr " 分钟"
-#: sidebar/trees/dirtree_module/dirtree_module.cpp:422
-msgid "Cannot find parent item %1 in the tree. Internal error."
-msgstr "无法在树中找到父项目 %1。内部错误。"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
-msgid "&Create New Folder"
-msgstr "创建新文件夹(&C)"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
-#: sidebar/trees/konq_sidebartree.cpp:905
-msgid "Delete Folder"
-msgstr "删除文件夹"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
-msgid "Delete Bookmark"
-msgstr "删除书签"
+#: sidebar/trees/history_module/history_module.cpp:351
+#: sidebar/trees/history_module/kcmhistory.cpp:263
+msgid "Do you really want to clear the entire history?"
+msgstr "您确定想要清空全部历史吗?"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
-#: sidebar/trees/konq_sidebartree.cpp:917
-msgid "Copy Link Address"
-msgstr "复制链接地址"
+#: sidebar/trees/history_module/history_module.cpp:353
+#: sidebar/trees/history_module/kcmhistory.cpp:265
+msgid "Clear History?"
+msgstr "清除历史吗?"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
+#: sidebar/trees/history_module/history_item.cpp:121
msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签文件夹\n"
-"“%1”吗?"
+"<qt>"
+"<center><b>%4</b></center>"
+"<hr>Last visited: %1"
+"<br>First visited: %2"
+"<br>Number of times visited: %3</qt>"
+msgstr "<qt><center><b>%4</b></center><hr>第一次访问:%2<br>最后访问:%1<br>访问次数:%3</qt>"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签\n"
-"“%1”吗?"
+#: sidebar/trees/history_module/history_module.cpp:80
+msgid "&Remove Entry"
+msgstr "删除项目(&R)"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
-msgid "Bookmark Folder Deletion"
-msgstr "书签文件夹删除"
+#: sidebar/trees/history_module/history_module.cpp:82
+msgid "C&lear History"
+msgstr "清除历史(&L)"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
-msgid "Bookmark Deletion"
-msgstr "书签删除"
+#: sidebar/trees/history_module/history_module.cpp:88
+msgid "By &Name"
+msgstr "按名称(&N)"
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
-msgid "Bookmark Properties"
-msgstr "书签属性"
+#: sidebar/trees/history_module/history_module.cpp:93
+msgid "By &Date"
+msgstr "按日期(&D)"
-#: sidebar/trees/konq_sidebartree.cpp:903
+#: sidebar/trees/konq_sidebartree.cpp:914
msgid "&Create New Folder..."
msgstr "创建新文件夹(&C)..."
-#: sidebar/trees/konq_sidebartree.cpp:909
+#: sidebar/trees/konq_sidebartree.cpp:920
msgid "Delete Link"
msgstr "删除链接"
-#: sidebar/trees/konq_sidebartree.cpp:955
+#: sidebar/trees/konq_sidebartree.cpp:966
msgid "New Folder"
msgstr "新建文件夹"
-#: sidebar/trees/konq_sidebartree.cpp:959
+#: sidebar/trees/konq_sidebartree.cpp:970
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: sidebar/trees/konq_sidebartree.cpp:960
+#: sidebar/trees/konq_sidebartree.cpp:971
msgid "Enter folder name:"
msgstr "输入文件夹名称:"
-#: sidebar/sidebar_widget.cpp:116
+#: sidebar/sidebar_widget.cpp:117
msgid "Rollback to System Default"
msgstr "重置为系统默认值"
-#: sidebar/sidebar_widget.cpp:122
+#: sidebar/sidebar_widget.cpp:123
msgid ""
"<qt>This removes all your entries from the sidebar and adds the system default "
"ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"
msgstr "<qt>这将从侧边栏删除全部自定义项,并添加系统默项。 <BR><B>此过程是不可撤销的。 </B><BR>您真的想要继续吗?</qt>"
-#: sidebar/sidebar_widget.cpp:277
+#: sidebar/sidebar_widget.cpp:278
msgid "Add New"
msgstr "添加新项"
-#: sidebar/sidebar_widget.cpp:278
+#: sidebar/sidebar_widget.cpp:279
msgid "Multiple Views"
msgstr "多视图"
-#: sidebar/sidebar_widget.cpp:279
+#: sidebar/sidebar_widget.cpp:280
msgid "Show Tabs Left"
msgstr "在左侧显示标签"
-#: sidebar/sidebar_widget.cpp:280
+#: sidebar/sidebar_widget.cpp:281
msgid "Show Configuration Button"
msgstr "显示配置按钮"
-#: sidebar/sidebar_widget.cpp:283
+#: sidebar/sidebar_widget.cpp:284
msgid "Close Navigation Panel"
msgstr "关闭导航面板"
-#: sidebar/sidebar_widget.cpp:346
+#: sidebar/sidebar_widget.cpp:347
msgid "This entry already exists."
msgstr "这个条目已经存在。"
-#: sidebar/sidebar_widget.cpp:360 sidebar/web_module/web_module.cpp:210
+#: sidebar/sidebar_widget.cpp:361 sidebar/web_module/web_module.cpp:210
msgid "Web SideBar Plugin"
msgstr "Web 侧边栏插件"
-#: sidebar/sidebar_widget.cpp:506
+#: sidebar/sidebar_widget.cpp:507
msgid "Enter a URL:"
msgstr "输入 URL:"
-#: sidebar/sidebar_widget.cpp:514
+#: sidebar/sidebar_widget.cpp:515
msgid "<qt><b>%1</b> does not exist</qt>"
msgstr "<qt><b>%1</b> 不存在</qt>"
-#: sidebar/sidebar_widget.cpp:531
+#: sidebar/sidebar_widget.cpp:532
msgid "<qt>Do you really want to remove the <b>%1</b> tab?</qt>"
msgstr "<qt>您真的想要删除 <b>%1</b> 标签吗?</qt>"
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
msgid "Set Name"
msgstr "设置名称"
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
msgid "Enter the name:"
msgstr "输入名称:"
-#: sidebar/sidebar_widget.cpp:634
+#: sidebar/sidebar_widget.cpp:635
msgid ""
"You have hidden the navigation panel configuration button. To make it visible "
"again, click the right mouse button on any of the navigation panel buttons and "
"select \"Show Configuration Button\"."
msgstr "您已经隐藏了导航面板配置按钮。要重新显示该按钮, 请用鼠标右键单击导航面板的任何一部分 并选择“显示配置按钮”。"
-#: sidebar/sidebar_widget.cpp:733
+#: sidebar/sidebar_widget.cpp:734
msgid "Configure Sidebar"
msgstr "配置侧边栏"
-#: sidebar/sidebar_widget.cpp:858
+#: sidebar/sidebar_widget.cpp:859
msgid "Set Name..."
msgstr "设置名称..."
-#: sidebar/sidebar_widget.cpp:859
+#: sidebar/sidebar_widget.cpp:860
msgid "Set URL..."
msgstr "设置 URL..."
-#: sidebar/sidebar_widget.cpp:860
+#: sidebar/sidebar_widget.cpp:861
msgid "Set Icon..."
msgstr "设置图标..."
-#: sidebar/sidebar_widget.cpp:864
+#: sidebar/sidebar_widget.cpp:865
msgid "Configure Navigation Panel"
msgstr "配置导航面板"
-#: sidebar/sidebar_widget.cpp:928
+#: sidebar/sidebar_widget.cpp:929
msgid "Unknown"
msgstr "未知"
@@ -2711,10 +2777,6 @@ msgstr " 分"
msgid " sec"
msgstr " 秒"
-#: sidebar/konqsidebar.cpp:118
-msgid "Extended Sidebar"
-msgstr "扩展的侧边栏"
-
#: sidebar/trees/bookmark_module/bookmark_module.h:85
msgid "Add Bookmark"
msgstr "添加书签"
@@ -2738,3 +2800,9 @@ msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
+
+#~ msgid "Cannot find parent item %1 in the tree. Internal error."
+#~ msgstr "无法在树中找到父项目 %1。内部错误。"
+
+#~ msgid "Extended Sidebar"
+#~ msgstr "扩展的侧边栏"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konsole.po b/tde-i18n-zh_CN/messages/tdebase/konsole.po
index 39789ca57ca..e0322354e4c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konsole.po
@@ -8,21 +8,22 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-08-03 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-12-03 21:54+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Wang Jian <lark@linux.net.cn>\n"
"X-Generator: KBabel 1.0\n"
-#: TEWidget.cpp:947 TEWidget.cpp:949
+#: TEWidget.cpp:964 TEWidget.cpp:966
msgid "Size: XXX x XXX"
msgstr "大小:XXX x XXX"
-#: TEWidget.cpp:954
+#: TEWidget.cpp:971
msgid "Size: %1 x %2"
msgstr "大小:%1 x %2"
@@ -38,231 +39,253 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: konsole.cpp:489 konsole_part.cpp:327
+#: konsole.cpp:215
+#, fuzzy
+msgid "&Session"
+msgstr "会话"
+
+#: konsole.cpp:219
+#, fuzzy
+msgid "Se&ttings"
+msgstr "设置"
+
+#: konsole.cpp:524 konsole_part.cpp:328
msgid "&Suspend Task"
msgstr "挂起任务(&S)"
-#: konsole.cpp:490 konsole_part.cpp:328
+#: konsole.cpp:525 konsole_part.cpp:329
msgid "&Continue Task"
msgstr "继续任务(&C)"
-#: konsole.cpp:491 konsole_part.cpp:329
+#: konsole.cpp:526 konsole_part.cpp:330
msgid "&Hangup"
msgstr "挂起(&H)"
-#: konsole.cpp:492 konsole_part.cpp:330
+#: konsole.cpp:527 konsole_part.cpp:331
msgid "&Interrupt Task"
msgstr "中断任务(&I)"
-#: konsole.cpp:493 konsole_part.cpp:331
+#: konsole.cpp:528 konsole_part.cpp:332
msgid "&Terminate Task"
msgstr "终止任务(&T)"
-#: konsole.cpp:494 konsole_part.cpp:332
+#: konsole.cpp:529 konsole_part.cpp:333
msgid "&Kill Task"
msgstr "杀死任务(&K)"
-#: konsole.cpp:495 konsole_part.cpp:333
+#: konsole.cpp:530 konsole_part.cpp:334
msgid "User Signal &1"
msgstr "用户信号 &1"
-#: konsole.cpp:496 konsole_part.cpp:334
+#: konsole.cpp:531 konsole_part.cpp:335
msgid "User Signal &2"
msgstr "用户信号 &2"
-#: konsole.cpp:507 konsole.cpp:722 konsole_part.cpp:470
+#: konsole.cpp:542 konsole.cpp:762 konsole_part.cpp:476
msgid "&Send Signal"
msgstr "发送信号(&S)"
-#: konsole.cpp:581
+#: konsole.cpp:616
msgid "&Tab Bar"
msgstr "标签栏(&T)"
-#: konsole.cpp:584 konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:619 konsole.cpp:627 konsole_part.cpp:349
msgid "&Hide"
msgstr "隐藏(&H)"
-#: konsole.cpp:584
+#: konsole.cpp:619
msgid "&Top"
msgstr "顶部(&T)"
-#: konsole.cpp:589 konsole_part.cpp:344
+#: konsole.cpp:624 konsole_part.cpp:345
msgid "Sc&rollbar"
msgstr "滚动条(&R)"
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
msgid "&Left"
msgstr "左(&L)"
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
msgid "&Right"
msgstr "右(&R)"
-#: konsole.cpp:605 konsole_part.cpp:354
+#: konsole.cpp:640 konsole_part.cpp:355
msgid "&Bell"
msgstr "响铃(&B)"
-#: konsole.cpp:608 konsole_part.cpp:358
+#: konsole.cpp:643 konsole_part.cpp:359
msgid "System &Bell"
msgstr "系统响铃(&B)"
-#: konsole.cpp:609 konsole_part.cpp:359
+#: konsole.cpp:644 konsole_part.cpp:360
msgid "System &Notification"
msgstr "系统通告(&N)"
-#: konsole.cpp:610 konsole_part.cpp:360
+#: konsole.cpp:645 konsole_part.cpp:361
msgid "&Visible Bell"
msgstr "视觉响铃(&V)"
-#: konsole.cpp:611 konsole_part.cpp:361
+#: konsole.cpp:646 konsole_part.cpp:362
msgid "N&one"
msgstr "无(&O)"
-#: konsole.cpp:619 konsole_part.cpp:366
+#: konsole.cpp:654 konsole_part.cpp:367
msgid "&Enlarge Font"
msgstr "增大字体(&E)"
-#: konsole.cpp:623 konsole_part.cpp:367
+#: konsole.cpp:658 konsole_part.cpp:368
msgid "&Shrink Font"
msgstr "减小字体(&S)"
-#: konsole.cpp:627 konsole_part.cpp:368
+#: konsole.cpp:662 konsole_part.cpp:369
msgid "Se&lect..."
msgstr "选择(&L)..."
-#: konsole.cpp:633
+#: konsole.cpp:668
msgid "&Install Bitmap..."
msgstr "安装位图(&I)..."
-#: konsole.cpp:641 konsole_part.cpp:372
+#: konsole.cpp:676 konsole_part.cpp:373
msgid "&Encoding"
msgstr "编码(&E)"
-#: konsole.cpp:649 konsole_part.cpp:385
+#: konsole.cpp:684 konsole_part.cpp:386
msgid "&Keyboard"
msgstr "键盘(&K)"
-#: konsole.cpp:653 konsole_part.cpp:395
+#: konsole.cpp:688 konsole_part.cpp:396
msgid "Sch&ema"
msgstr "方案(&E)"
-#: konsole.cpp:658
+#: konsole.cpp:693
msgid "S&ize"
msgstr "大小(&I)"
-#: konsole.cpp:661
+#: konsole.cpp:696
msgid "40x15 (&Small)"
msgstr "40x15 (小)(&S)"
-#: konsole.cpp:662
+#: konsole.cpp:697
msgid "80x24 (&VT100)"
msgstr "80x24 (&VT100)"
-#: konsole.cpp:663
+#: konsole.cpp:698
msgid "80x25 (&IBM PC)"
msgstr "80x25 (&IBM PC)"
-#: konsole.cpp:664
+#: konsole.cpp:699
msgid "80x40 (&XTerm)"
msgstr "80x24 (&XTerm)"
-#: konsole.cpp:665
+#: konsole.cpp:700
msgid "80x52 (IBM V&GA)"
msgstr "80x52 (IBM V&GA)"
-#: konsole.cpp:667
+#: konsole.cpp:702
msgid "&Custom..."
msgstr "自定义(&C)..."
-#: konsole.cpp:672
+#: konsole.cpp:707
msgid "Hist&ory..."
msgstr "历史(&O)..."
-#: konsole.cpp:678 konsole_part.cpp:447
+#: konsole.cpp:713 konsole_part.cpp:453
msgid "&Save as Default"
msgstr "保存为默认值(&S)"
-#: konsole.cpp:701
+#: konsole.cpp:736
msgid "&Tip of the Day"
msgstr "日积月累(&T)"
-#: konsole.cpp:715 konsole_part.cpp:456
+#: konsole.cpp:750 konsole_part.cpp:462
msgid "Set Selection End"
msgstr "设置选择区结束点"
-#: konsole.cpp:726
+#: konsole.cpp:758
+msgid "&Open.."
+msgstr ""
+
+#: konsole.cpp:766
msgid "New Sess&ion"
msgstr "新建会话(&I)"
-#: konsole.cpp:739 konsole_part.cpp:476
+#: konsole.cpp:779 konsole_part.cpp:482
msgid "S&ettings"
msgstr "设置(&E)"
-#: konsole.cpp:794 konsole.cpp:1076
+#: konsole.cpp:836 konsole.cpp:1139
msgid "&Detach Session"
msgstr "漂移会话(&D)"
-#: konsole.cpp:797 konsole.cpp:1080
+#: konsole.cpp:841 konsole.cpp:1144
msgid "&Rename Session..."
msgstr "重命名会话(&R)..."
-#: konsole.cpp:801 konsole.cpp:1089
+#: konsole.cpp:845 konsole.cpp:1153
msgid "Monitor for &Activity"
msgstr "活动状态监视器(&A)"
-#: konsole.cpp:803 konsole.cpp:1092
+#: konsole.cpp:847 konsole.cpp:1156
msgid "Stop Monitoring for &Activity"
msgstr "停止监视活动(&A)"
-#: konsole.cpp:806 konsole.cpp:1094
+#: konsole.cpp:850 konsole.cpp:1158
msgid "Monitor for &Silence"
msgstr "静止状态监视器(&S)"
-#: konsole.cpp:808 konsole.cpp:1097
+#: konsole.cpp:852 konsole.cpp:1161
msgid "Stop Monitoring for &Silence"
msgstr "停止监视静止(&S)"
-#: konsole.cpp:811 konsole.cpp:1099
+#: konsole.cpp:855 konsole.cpp:1163
msgid "Send &Input to All Sessions"
msgstr "将输入发给所有的会话(&I)"
-#: konsole.cpp:816
+#: konsole.cpp:862 konsole.cpp:1196
+msgid "&Move Session Left"
+msgstr "将会话左移(&M)"
+
+#: konsole.cpp:869 konsole.cpp:1202
+msgid "M&ove Session Right"
+msgstr "将会话右移(&O)"
+
+#: konsole.cpp:876
msgid "Select &Tab Color..."
msgstr "选择标签颜色(&T)..."
-#: konsole.cpp:820
+#: konsole.cpp:880
msgid "Switch to Tab"
msgstr "切换到标签"
-#: konsole.cpp:825 konsole.cpp:1119 konsole.cpp:1201 konsole.cpp:2992
+#: konsole.cpp:885 konsole.cpp:1183 konsole.cpp:1271 konsole.cpp:3088
msgid "C&lose Session"
msgstr "关闭会话(&L)"
-#: konsole.cpp:835
+#: konsole.cpp:895
msgid "Tab &Options"
msgstr "标签选项(&O)"
-#: konsole.cpp:837
+#: konsole.cpp:897
msgid "&Text && Icons"
msgstr "文字和图标(&T)"
-#: konsole.cpp:837
+#: konsole.cpp:897
msgid "Text &Only"
msgstr "只有文字(&O)"
-#: konsole.cpp:837
+#: konsole.cpp:897
msgid "&Icons Only"
msgstr "只有图标(&I)"
-#: konsole.cpp:844
+#: konsole.cpp:904
msgid "&Dynamic Hide"
msgstr "动态隐藏(&D)"
-#: konsole.cpp:849
+#: konsole.cpp:909
msgid "&Auto Resize Tabs"
msgstr "自动缩放标签(&A)"
-#: konsole.cpp:917
+#: konsole.cpp:978
msgid ""
"Click for new standard session\n"
"Click and hold for session menu"
@@ -270,112 +293,96 @@ msgstr ""
"单击此处可新建标准会话\n"
"单击并按住可出现会话菜单"
-#: konsole.cpp:926
+#: konsole.cpp:987
msgid "Close the current session"
msgstr "关闭当前会话"
-#: konsole.cpp:1030
-msgid "Session"
-msgstr "会话"
-
-#: konsole.cpp:1036
-msgid "Settings"
-msgstr "设置"
-
-#: konsole.cpp:1046
+#: konsole.cpp:1107
msgid "Paste Selection"
msgstr "粘贴选择区"
-#: konsole.cpp:1049
+#: konsole.cpp:1110
msgid "C&lear Terminal"
msgstr "关闭终端(&L)"
-#: konsole.cpp:1051
+#: konsole.cpp:1112
msgid "&Reset && Clear Terminal"
msgstr "重置并清除终端(&R)"
-#: konsole.cpp:1053
+#: konsole.cpp:1114
msgid "&Find in History..."
msgstr "在历史中查找(&F)..."
-#: konsole.cpp:1061
+#: konsole.cpp:1122
msgid "Find Pre&vious"
msgstr "查找上一个(&V)"
-#: konsole.cpp:1065
+#: konsole.cpp:1126
msgid "S&ave History As..."
msgstr "历史另存为(&A)..."
-#: konsole.cpp:1069
+#: konsole.cpp:1130
msgid "Clear &History"
msgstr "清除历史(&H)"
-#: konsole.cpp:1073
+#: konsole.cpp:1134
msgid "Clear All H&istories"
msgstr "清除全部历史记录(&I)"
-#: konsole.cpp:1084
+#: konsole.cpp:1148
msgid "&ZModem Upload..."
msgstr "&ZModem 上传..."
-#: konsole.cpp:1104
+#: konsole.cpp:1168
msgid "Hide &Menubar"
msgstr "隐藏菜单栏(&M)"
-#: konsole.cpp:1110
+#: konsole.cpp:1174
msgid "Save Sessions &Profile..."
msgstr "保存会话配置(&P)..."
-#: konsole.cpp:1121
+#: konsole.cpp:1185
msgid "&Print Screen..."
msgstr "打印屏幕(&P)..."
-#: konsole.cpp:1126
+#: konsole.cpp:1190
msgid "New Session"
msgstr "新建会话"
-#: konsole.cpp:1127
+#: konsole.cpp:1191
msgid "Activate Menu"
msgstr "激活菜单"
-#: konsole.cpp:1128
+#: konsole.cpp:1192
msgid "List Sessions"
msgstr "列出会话"
-#: konsole.cpp:1130
-msgid "&Move Session Left"
-msgstr "将会话左移(&M)"
-
-#: konsole.cpp:1133
-msgid "M&ove Session Right"
-msgstr "将会话右移(&O)"
-
-#: konsole.cpp:1137
+#: konsole.cpp:1207
msgid "Go to Previous Session"
msgstr "前往上一个会话"
-#: konsole.cpp:1139
+#: konsole.cpp:1209
msgid "Go to Next Session"
msgstr "前往下一个会话"
-#: konsole.cpp:1143
+#: konsole.cpp:1213
#, c-format
msgid "Switch to Session %1"
msgstr "切换到会话 %1"
-#: konsole.cpp:1146
+#: konsole.cpp:1216
msgid "Enlarge Font"
msgstr "增大字体"
-#: konsole.cpp:1147
+#: konsole.cpp:1217
msgid "Shrink Font"
msgstr "减小字体"
-#: konsole.cpp:1149
+#: konsole.cpp:1219
msgid "Toggle Bidi"
msgstr "切换双向文字"
-#: konsole.cpp:1196
+#: konsole.cpp:1266
msgid ""
"You have open sessions (besides the current one). These will be killed if you "
"continue.\n"
@@ -385,29 +392,29 @@ msgstr ""
"如果您继续,这些会话会中断。\n"
"您确定要退出吗?"
-#: konsole.cpp:1199
+#: konsole.cpp:1269
msgid "Really Quit?"
msgstr "真的退出吗?"
-#: konsole.cpp:1232
+#: konsole.cpp:1302
msgid ""
"The application running in Konsole does not respond to the close request. Do "
"you want Konsole to close anyway?"
msgstr "运行于 Konsole 的应用程序没有响应关闭请求。您还是想要关闭 Konsole 吗?"
-#: konsole.cpp:1234
+#: konsole.cpp:1304
msgid "Application Does Not Respond"
msgstr "应用程序没有响应"
-#: konsole.cpp:1417
+#: konsole.cpp:1484
msgid "Save Sessions Profile"
msgstr "保存会话配置"
-#: konsole.cpp:1418
+#: konsole.cpp:1485
msgid "Enter name under which the profile should be saved:"
msgstr "请输入配置将要被保存的名称:"
-#: konsole.cpp:1809
+#: konsole.cpp:1887
msgid ""
"If you want to use the bitmap fonts distributed with Konsole, they must be "
"installed. After installation, you must restart Konsole to use them. Do you "
@@ -416,27 +423,27 @@ msgstr ""
"如果您想要在 Konsole 中使用位图字体,则必须安装这些字体。安装后,您必须重新启动 Konsole 才能使用这些字体。您是否想要将下列字体安装到 "
"fonts:/个人?"
-#: konsole.cpp:1811
+#: konsole.cpp:1889
msgid "Install Bitmap Fonts?"
msgstr "安装位图字体吗?"
-#: konsole.cpp:1812
+#: konsole.cpp:1890
msgid "&Install"
msgstr "安装(&I)"
-#: konsole.cpp:1813
+#: konsole.cpp:1891
msgid "Do Not Install"
msgstr "不安装"
-#: konsole.cpp:1825
+#: konsole.cpp:1903
msgid "Could not install %1 into fonts:/Personal/"
msgstr "无法将 %1 安装到 fonts:/Personal/"
-#: konsole.cpp:1909
+#: konsole.cpp:1987
msgid "Use the right mouse button to bring back the menu"
msgstr "使用右键重新显示菜单"
-#: konsole.cpp:2034
+#: konsole.cpp:2112
msgid ""
"You have chosen one or more Ctrl+<key> combinations to be used as shortcuts. As "
"a result these key combinations will no longer be passed to the command shell "
@@ -456,82 +463,87 @@ msgstr ""
"\n"
"您目前正在使用下列 Ctrl+<按键> 组合:"
-#: konsole.cpp:2044
+#: konsole.cpp:2122
msgid "Choice of Shortcut Keys"
msgstr "快捷键选择"
-#: konsole.cpp:2431
+#: konsole.cpp:2525
msgid ""
"_: abbreviation of number\n"
"%1 No. %2"
msgstr "第 %2 个 %1"
-#: konsole.cpp:2486
+#: konsole.cpp:2580
msgid "Session List"
msgstr "会话列表"
-#: konsole.cpp:2991
+#: konsole.cpp:3087
msgid "Are you sure that you want to close the current session?"
msgstr "您真的想要关闭当前会话吗?"
-#: konsole.cpp:2992
+#: konsole.cpp:3088
msgid "Close Confirmation"
msgstr "关闭确认"
-#: konsole.cpp:3373 konsole.cpp:3431 konsole.cpp:3452
+#: konsole.cpp:3467 konsole.cpp:3525 konsole.cpp:3546
msgid "New "
msgstr "新建"
-#: konsole.cpp:3417 konsole.cpp:3419 konsole.cpp:3435 konsole.cpp:3437
+#: konsole.cpp:3511 konsole.cpp:3513 konsole.cpp:3529 konsole.cpp:3531
msgid "New &Window"
msgstr "新建窗口(&W)"
-#: konsole.cpp:3461
+#: konsole.cpp:3555
msgid "New Shell at Bookmark"
msgstr "在书签新建 Shell"
-#: konsole.cpp:3464
+#: konsole.cpp:3558
msgid "Shell at Bookmark"
msgstr "书签处的 Shell"
-#: konsole.cpp:3475
+#: konsole.cpp:3569
#, c-format
msgid ""
"_: Screen is a program controlling screens!\n"
"Screen at %1"
msgstr "在 %1 上运行 screen"
-#: konsole.cpp:3788
+#: konsole.cpp:3888
msgid "Rename Session"
msgstr "重命名会话"
-#: konsole.cpp:3789
+#: konsole.cpp:3889
msgid "Session name:"
msgstr "会话名:"
-#: konsole.cpp:3824 konsole_part.cpp:969
+#: konsole.cpp:3924 konsole_part.cpp:996
msgid "History Configuration"
msgstr "历史配置"
-#: konsole.cpp:3832 konsole_part.cpp:977
+#: konsole.cpp:3932 konsole_part.cpp:1004
msgid "&Enable"
msgstr "启用(&E)"
-#: konsole.cpp:3835
+#: konsole.cpp:3935
msgid "&Number of lines: "
msgstr "行数(&N):"
-#: konsole.cpp:3839 konsole_part.cpp:984
+#: konsole.cpp:3939 konsole_part.cpp:1011
msgid ""
"_: Unlimited (number of lines)\n"
"Unlimited"
msgstr "无限制"
-#: konsole.cpp:3843 konsole_part.cpp:986
+#: konsole.cpp:3943 konsole_part.cpp:1013
msgid "&Set Unlimited"
msgstr "设置无限制(&S)"
-#: konsole.cpp:4000
+#: konsole.cpp:4071
+#, c-format
+msgid "%1"
+msgstr ""
+
+#: konsole.cpp:4128
msgid ""
"End of history reached.\n"
"Continue from the beginning?"
@@ -539,11 +551,11 @@ msgstr ""
"已经到达历史记录的结尾处。\n"
"从开始处继续?"
-#: konsole.cpp:4001 konsole.cpp:4009 konsole.cpp:4018
+#: konsole.cpp:4129 konsole.cpp:4137 konsole.cpp:4146
msgid "Find"
msgstr "查找"
-#: konsole.cpp:4008
+#: konsole.cpp:4136
msgid ""
"Beginning of history reached.\n"
"Continue from the end?"
@@ -551,21 +563,21 @@ msgstr ""
"已经到达历史记录的开始处。\n"
"从结尾处继续?"
-#: konsole.cpp:4017
+#: konsole.cpp:4145
msgid "Search string '%1' not found."
msgstr "字符串“%1”没有找到"
-#: konsole.cpp:4034
+#: konsole.cpp:4162
msgid "Save History"
msgstr "保存历史"
-#: konsole.cpp:4040
+#: konsole.cpp:4168
msgid ""
"This is not a local file.\n"
msgstr ""
"这不是本地文件。\n"
-#: konsole.cpp:4050
+#: konsole.cpp:4178
msgid ""
"A file with this name already exists.\n"
"Do you want to overwrite it?"
@@ -573,27 +585,27 @@ msgstr ""
"已经存在这个名字的文件。\n"
"您想覆盖它吗?"
-#: konsole.cpp:4050
+#: konsole.cpp:4178
msgid "File Exists"
msgstr "文件已存在"
-#: konsole.cpp:4050
+#: konsole.cpp:4178
msgid "Overwrite"
msgstr "覆盖"
-#: konsole.cpp:4055
+#: konsole.cpp:4183
msgid "Unable to write to file."
msgstr "无法写入文件。"
-#: konsole.cpp:4065
+#: konsole.cpp:4193
msgid "Could not save history."
msgstr "无法保存历史。"
-#: konsole.cpp:4076
+#: konsole.cpp:4204
msgid "<p>The current session already has a ZModem file transfer in progress."
msgstr "<p>当前会话已经有一个 ZModem 文件传送在进行。"
-#: konsole.cpp:4085
+#: konsole.cpp:4213
msgid ""
"<p>No suitable ZModem software was found on the system.\n"
"<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"
@@ -601,11 +613,11 @@ msgstr ""
"<p>系统中未发现有合适的 ZModem 软件。\n"
"<p>您可以安装“rzsz”或者“lrzsz”软件包。\n"
-#: konsole.cpp:4092
+#: konsole.cpp:4220
msgid "Select Files to Upload"
msgstr "选择要上传的文件"
-#: konsole.cpp:4112
+#: konsole.cpp:4240
msgid ""
"<p>A ZModem file transfer attempt has been detected, but no suitable ZModem "
"software was found on the system.\n"
@@ -614,7 +626,7 @@ msgstr ""
"<p>检测到一个 ZModem 文件传送尝试,但系统中未发现合适的 ZModem 软件。\n"
"<p>您可以安装‘rzsz’或者‘lrzsz’软件包。\n"
-#: konsole.cpp:4119
+#: konsole.cpp:4247
msgid ""
"A ZModem file transfer attempt has been detected.\n"
"Please specify the folder you want to store the file(s):"
@@ -622,127 +634,131 @@ msgstr ""
"检测到一个 ZModem 文件传送尝试。\n"
"请指定您要存放此文件的文件夹:"
-#: konsole.cpp:4122
+#: konsole.cpp:4250
msgid "&Download"
msgstr "下载(&D)"
-#: konsole.cpp:4123 konsole.cpp:4124
+#: konsole.cpp:4251 konsole.cpp:4252
msgid "Start downloading file to specified folder."
msgstr "开始将文件下载到指定的文件夹。"
-#: konsole.cpp:4140
+#: konsole.cpp:4268
#, c-format
msgid "Print %1"
msgstr "打印 %1"
-#: konsole.cpp:4167
+#: konsole.cpp:4295
msgid "Size Configuration"
msgstr "大小配置"
-#: konsole.cpp:4181
+#: konsole.cpp:4309
msgid "Number of columns:"
msgstr "列数:"
-#: konsole.cpp:4184 konsole_part.cpp:991
+#: konsole.cpp:4312 konsole_part.cpp:1018
msgid "Number of lines:"
msgstr "行数:"
-#: konsole.cpp:4212
+#: konsole.cpp:4340
msgid "As &regular expression"
msgstr "作为正规表达式(&R)"
-#: konsole.cpp:4215
+#: konsole.cpp:4343
msgid "&Edit..."
msgstr "编辑(&E)..."
-#: konsole_part.cpp:92 main.cpp:168
+#: konsole_part.cpp:92 main.cpp:165
msgid "Konsole"
msgstr "Konsole"
-#: konsole_part.cpp:399
+#: konsole_part.cpp:400
msgid "&History..."
msgstr "历史(&H)..."
-#: konsole_part.cpp:405
+#: konsole_part.cpp:406
msgid "Li&ne Spacing"
msgstr "行间距(&N)"
-#: konsole_part.cpp:411
+#: konsole_part.cpp:412
msgid "&0"
msgstr "&0"
-#: konsole_part.cpp:412
+#: konsole_part.cpp:413
msgid "&1"
msgstr "&1"
-#: konsole_part.cpp:413
+#: konsole_part.cpp:414
msgid "&2"
msgstr "&2"
-#: konsole_part.cpp:414
+#: konsole_part.cpp:415
msgid "&3"
msgstr "&3"
-#: konsole_part.cpp:415
+#: konsole_part.cpp:416
msgid "&4"
msgstr "&4"
-#: konsole_part.cpp:416
+#: konsole_part.cpp:417
msgid "&5"
msgstr "&5"
-#: konsole_part.cpp:417
+#: konsole_part.cpp:418
msgid "&6"
msgstr "&6"
-#: konsole_part.cpp:418
+#: konsole_part.cpp:419
msgid "&7"
msgstr "&7"
-#: konsole_part.cpp:419
+#: konsole_part.cpp:420
msgid "&8"
msgstr "&8"
-#: konsole_part.cpp:424
+#: konsole_part.cpp:425
msgid "Blinking &Cursor"
msgstr "闪烁光标(&C)"
-#: konsole_part.cpp:429
+#: konsole_part.cpp:430
msgid "Show Fr&ame"
msgstr "显示边框(&A)"
-#: konsole_part.cpp:431
+#: konsole_part.cpp:432
msgid "Hide Fr&ame"
msgstr "隐藏边框(&A)"
-#: konsole_part.cpp:435
+#: konsole_part.cpp:436
+msgid "Me&ta key as Alt key"
+msgstr ""
+
+#: konsole_part.cpp:441
msgid "Wor&d Connectors..."
msgstr "字分隔符(&D)..."
-#: konsole_part.cpp:441
+#: konsole_part.cpp:447
msgid "&Use Konsole's Settings"
msgstr "使用 Konsole 的设置(&U)"
-#: konsole_part.cpp:480
+#: konsole_part.cpp:486
msgid "&Close Terminal Emulator"
msgstr "关闭终端模拟器(&C)"
-#: konsole_part.cpp:919
+#: konsole_part.cpp:946
msgid "Word Connectors"
msgstr "字分隔符"
-#: konsole_part.cpp:920
+#: konsole_part.cpp:947
msgid ""
"Characters other than alphanumerics considered part of a word when double "
"clicking:"
msgstr "当双击时,非字母表字符被当作词的一部分:"
-#: kwrited.cpp:84
+#: kwrited.cpp:85
#, c-format
msgid "KWrited - Listening on Device %1"
msgstr "KWrited - 在设备 %1 上监听"
-#: kwrited.cpp:117
+#: kwrited.cpp:118
msgid "Clear Messages"
msgstr "清除消息"
@@ -798,111 +814,107 @@ msgstr "不显示滚动条"
msgid "Do not use Xft (anti-aliasing)"
msgstr "不使用 Xft(平滑)"
-#: main.cpp:79
-msgid "Enable experimental support for real transparency"
-msgstr "允许真实透明的试验性支持"
-
-#: main.cpp:81
+#: main.cpp:78
msgid "Terminal size in columns x lines"
msgstr "列 x 行表示的终端大小"
-#: main.cpp:82
+#: main.cpp:79
msgid "Terminal size is fixed"
msgstr "终端大小固定"
-#: main.cpp:83
+#: main.cpp:80
msgid "Start with given session type"
msgstr "用给定的会话类型启动"
-#: main.cpp:84
+#: main.cpp:81
msgid "List available session types"
msgstr "列出可用的会话类型"
-#: main.cpp:85
+#: main.cpp:82
msgid "Set keytab to 'name'"
msgstr "将 keytab 设置为“name”"
-#: main.cpp:86
+#: main.cpp:83
msgid "List available keytabs"
msgstr "列出可用的 keytab"
-#: main.cpp:87
+#: main.cpp:84
msgid "Start with given session profile"
msgstr "用给定的会话配置启动"
-#: main.cpp:88
+#: main.cpp:85
msgid "List available session profiles"
msgstr "列出可用的会话配置"
-#: main.cpp:89
+#: main.cpp:86
msgid "Set schema to 'name' or use 'file'"
msgstr "将配色方案设置为“name”或使用“file”"
-#: main.cpp:91
+#: main.cpp:88
msgid "List available schemata"
msgstr "列出可用的方案"
-#: main.cpp:92
+#: main.cpp:89
msgid "Enable extended DCOP Qt functions"
msgstr "启用扩展的 DCOP Qt 函数"
-#: main.cpp:93
+#: main.cpp:90
msgid "Change working directory to 'dir'"
msgstr "将工作目录更改为“dir”"
-#: main.cpp:94
+#: main.cpp:91
msgid "Execute 'command' instead of shell"
msgstr "执行“command”而不是 shell"
-#: main.cpp:96
+#: main.cpp:93
msgid "Arguments for 'command'"
msgstr "“command”的参数"
-#: main.cpp:171
+#: main.cpp:168
msgid "Maintainer"
msgstr "维护者"
-#: main.cpp:172
+#: main.cpp:169
msgid "Author"
msgstr "作者"
-#: main.cpp:174 main.cpp:177 main.cpp:180
+#: main.cpp:171 main.cpp:174 main.cpp:177
msgid "bug fixing and improvements"
msgstr "错误修正和改进"
-#: main.cpp:183 main.cpp:219 main.cpp:222 main.cpp:225 main.cpp:228
+#: main.cpp:180 main.cpp:216 main.cpp:219 main.cpp:222 main.cpp:225
msgid "bug fixing"
msgstr "错误修正"
-#: main.cpp:186
+#: main.cpp:183
msgid "Solaris support and work on history"
msgstr "Solaris 支持和历史"
-#: main.cpp:189
+#: main.cpp:186
msgid "faster startup, bug fixing"
msgstr "更快启动、错误修补"
-#: main.cpp:192
+#: main.cpp:189
msgid "decent marking"
msgstr "大方的记号"
-#: main.cpp:195
+#: main.cpp:192
msgid ""
"partification\n"
"Toolbar and session names"
msgstr "工具栏和会话名"
-#: main.cpp:199
+#: main.cpp:196
msgid ""
"partification\n"
"overall improvements"
msgstr "整体改进"
-#: main.cpp:203
+#: main.cpp:200
msgid "transparency"
msgstr "透明"
-#: main.cpp:206
+#: main.cpp:203
msgid ""
"most of main.C donated via kvt\n"
"overall improvements"
@@ -910,19 +922,19 @@ msgstr ""
"大多数的 main.C 由 kvt 贡献\n"
"整体的改进"
-#: main.cpp:210
+#: main.cpp:207
msgid "schema and selection improvements"
msgstr "方案和选择改进"
-#: main.cpp:213
+#: main.cpp:210
msgid "SGI Port"
msgstr "SGI 移植"
-#: main.cpp:216
+#: main.cpp:213
msgid "FreeBSD port"
msgstr "FreeBSD 移植"
-#: main.cpp:230
+#: main.cpp:227
msgid ""
"Thanks to many others.\n"
"The above list only reflects the contributors\n"
@@ -931,13 +943,13 @@ msgstr ""
"感谢很多其他的人。\n"
"上面的列表只是我能够保留记录的一部分贡献者。"
-#: main.cpp:337
+#: main.cpp:284
msgid ""
"You can't use BOTH -ls and -e.\n"
msgstr ""
"你不能同时使用 -ls 和 -e。\n"
-#: main.cpp:464
+#: main.cpp:411
msgid ""
"expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"
msgstr ""
@@ -1102,7 +1114,7 @@ msgstr "会话“%1”以信号 %2 退出。"
msgid "Session '%1' exited unexpectedly."
msgstr "会话“%1”意外退出。"
-#: session.cpp:649
+#: session.cpp:655
msgid "ZModem Progress"
msgstr "ZModem 进度"
@@ -1312,26 +1324,29 @@ msgstr ""
"按左键的同时再按Shift键一样可以选择文本。\n"
#: tips.cpp:153
+#, fuzzy
msgid ""
"<p>...that you can let Konsole set the current directory as the window title?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[0m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
msgstr ""
"<p>……您可以让 Konsole 把当前目录的名称设置为窗口标题。\n"
"对于 Bash 来说,将“export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"”加到~/.bashrc中。\n"
#: tips.cpp:159
+#, fuzzy
msgid ""
"<p>...that you can let Konsole set the current directory as the session name?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[30m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
msgstr ""
"<p>……您可以让 Konsole 把当前目录的名称设置为会话名称。\n"
"对于 Bash 来说,将“export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"”加到~/.bashrc中。\n"
#: tips.cpp:165
+#, fuzzy
msgid ""
"<p>...that if you let your shell pass the current directory to Konsole within "
"the prompt\n"
-"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e]31;\\w\\a\\]\"' in your "
+"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e[31m\\w\\a\\]\"' in your "
"~/.bashrc, then\n"
"Konsole can bookmark it, and session management will remember your current "
"working directory\n"
@@ -1343,6 +1358,28 @@ msgstr ""
#: tips.cpp:173
msgid ""
+"<p>...that working with remote hosts in Konsole can be made much easier by "
+"setting the\n"
+"prompt to correctly show your hostname and present path? Try setting your "
+"prompt in our\n"
+"~/.bashrc with: \"export PS1='\\[\\e[0m\\h:\\w> '\" You can then just select "
+"your prompt and\n"
+"press middle-mouse to paste it as the source or destination on the command "
+"line.\n"
+msgstr ""
+
+#: tips.cpp:181
+msgid ""
+"<p>...that you can temporarily set the prompt for Konsole by setting the 'PS1=' "
+"variable\n"
+"without having to edit your ~/.bashrc. Try entering the following on the "
+"command line to\n"
+"set your prompt. It will also include the current time before the path:\n"
+"PS1='\\[\\e[0;37m\\]\\A\\[\\e[1;34m\\] \\[\\e[1;34m\\]\\h:\\w> \\[\\e[0m\\]'\n"
+msgstr ""
+
+#: tips.cpp:189
+msgid ""
"<p>...that double-clicking will select a whole word?\n"
"<p>When you don't release the mouse button after the second click you\n"
"can extend your selection by additional words when moving the mouse.\n"
@@ -1350,7 +1387,7 @@ msgstr ""
"<p>……双击可以选择整个单词。\n"
"<p>第二次点击后,移动鼠标而不松开鼠标键,就可以选择更多的单词。\n"
-#: tips.cpp:180
+#: tips.cpp:196
msgid ""
"<p>...that triple-clicking will select a whole line?\n"
"<p>When you don't release the mouse button after the third click you\n"
@@ -1359,19 +1396,20 @@ msgstr ""
"<p>……三次点击鼠标可以选择整行。\n"
"<p>第三次点击后,移动鼠标而不松开鼠标键,就可以选择更多的行。\n"
-#: tips.cpp:187
+#: tips.cpp:203
+#, fuzzy
msgid ""
"<p>...that if you drag &amp; drop a URL into a Konsole window you are presented "
"with a\n"
"menu giving the option to copy or move the specified file into the current "
"working directory,\n"
"as well as just pasting the URL as text.\n"
-"<p>This works with any type of URL which TDE supports.\n"
+"<p>This works with any type of URL which KDE supports.\n"
msgstr ""
"<p>……如果您将 URL 拖放到 Konsole 窗口中,您将会看到一个菜单,其中的选项包括将文件复制/移动到当前工作目录中,以及将 URL 粘贴为文本。\n"
"<p>只要 TDE 支持,任何类型的 URL 均如此对待。\n"
-#: tips.cpp:195
+#: tips.cpp:211
msgid ""
"<p>...that the \"Settings->Configure Shortcuts...\" dialog allows you to define "
"keyboard shortcuts for actions\n"
@@ -1380,7 +1418,7 @@ msgid ""
msgstr ""
"<p>……“设置/配置快捷键...”对话框允许您为没有显示在菜单中的操作定义快捷键,比如激活菜单、更改字体以及列出并切换会话。\n"
-#: tips.cpp:201
+#: tips.cpp:217
msgid ""
"<p>...that right-clicking over the \"New\" button in the left corner of the "
"tabbar or in an empty tabbar space displays a menu where you can set several "
@@ -1392,5 +1430,8 @@ msgstr ""
msgid "&Stop"
msgstr "停止(&S)"
+#~ msgid "Enable experimental support for real transparency"
+#~ msgstr "允许真实透明的试验性支持"
+
#~ msgid "Do not use the ARGB32 visual (transparency)"
#~ msgstr "不使用 ARGB32 视觉(透明)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kpager.po b/tde-i18n-zh_CN/messages/tdebase/kpager.po
index 6dc51c40781..f5115104d8d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kpager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kpager.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kpager\n"
-"POT-Creation-Date: 2006-08-16 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-27 23:52+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po b/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
index c0947cfcd87..ab7cfddfbc5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
@@ -6,87 +6,16 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2005-09-03 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-21 22:45+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Jiang Xiong <jxiong@linux.net.cn>\n"
-#: kstylepage.cpp:50
-msgid "Style"
-msgstr "风格"
-
-#: kstylepage.cpp:51
-msgid "Description"
-msgstr "描述"
-
-#: kstylepage.cpp:55
-msgid "Plastik"
-msgstr "塑料"
-
-#: kstylepage.cpp:55
-msgid "Light"
-msgstr "光线"
-
-#: kstylepage.cpp:56
-msgid "TDE default style"
-msgstr "TDE 默认风格"
-
-#: kstylepage.cpp:59
-msgid "TDE Classic"
-msgstr "TDE 经典"
-
-#: kstylepage.cpp:60
-msgid "Classic TDE style"
-msgstr "TDE 经典风格"
-
-#: kstylepage.cpp:63
-msgid "Keramik"
-msgstr "Keramik"
-
-#: kstylepage.cpp:64
-msgid "The previous default style"
-msgstr "先前的默认风格"
-
-#: kstylepage.cpp:67
-msgid "Sunshine"
-msgstr "阳光"
-
-#: kstylepage.cpp:68
-msgid "A very common desktop"
-msgstr "非常普通的桌面"
-
-#: kstylepage.cpp:71
-msgid "Redmond"
-msgstr "Redmond"
-
-#: kstylepage.cpp:72
-msgid "A style from the northwest of the USA"
-msgstr "来自美国西北某地的风格"
-
-#: kstylepage.cpp:75
-msgid "Platinum"
-msgstr "白金"
-
-#: kstylepage.cpp:76
-msgid "The platinum style"
-msgstr "白金风格"
-
-#: kcountrypage.cpp:48
-msgid "<h3>Welcome to TDE %1</h3>"
-msgstr "<h3>欢迎使用 TDE %1</h3>"
-
-#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
-msgid "without name"
-msgstr "没有名字"
-
-#: kcountrypage.cpp:142
-msgid "All"
-msgstr "全部"
-
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -99,81 +28,21 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: main.cpp:27 main.cpp:38
-msgid "KPersonalizer"
-msgstr "个性化设置向导"
-
-#: main.cpp:31
-msgid "Personalizer is restarted by itself"
-msgstr "个性化向导自行重新启动"
-
-#: main.cpp:32
-msgid "Personalizer is running before TDE session"
-msgstr "在 TDE 会话前启动个性化向导"
-
-#: kpersonalizer.cpp:67
-msgid "Step 1: Introduction"
-msgstr "第一步:简介"
-
-#: kpersonalizer.cpp:71
-msgid "Step 2: I want it my Way..."
-msgstr "第二步:做我自己..."
-
-#: kpersonalizer.cpp:75
-msgid "Step 3: Eyecandy-O-Meter"
-msgstr "第三步:视觉效果"
-
-#: kpersonalizer.cpp:79
-msgid "Step 4: Everybody loves Themes"
-msgstr "第四步:应用主题"
-
-#: kpersonalizer.cpp:83
-msgid "Step 5: Time to Refine"
-msgstr "第五步:细微调整"
-
-#: kpersonalizer.cpp:86
-msgid "S&kip Wizard"
-msgstr "跳过向导(&K)"
-
-#: kpersonalizer.cpp:152
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>The Desktop Settings Wizard helps you to configure the TDE desktop to your "
-"personal liking.</p>"
-"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>您确定想要退出桌面设置向导吗?</p>"
-"<p>桌面设置向导可以帮助您配置 TDE 桌面来符合您的胃口。</p>"
-"<p>单击<b>取消</b>返回并继续您的设置。</p>"
-
-#: kpersonalizer.cpp:156
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>If yes, click <b>Quit</b> and all changes will be lost."
-"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>您确定想要退出桌面设置向导吗?</p>"
-"<p>如果是的话,单击<b>退出</b>就会丢弃所有更改。"
-"<br>如果不是的话,单击<b>取消</b>可以返回并继续您的设置。</p>"
-
-#: kpersonalizer.cpp:160
-msgid "All Changes Will Be Lost"
-msgstr "所有更改都将丢失"
-
#: kospage.cpp:352
+#, fuzzy
msgid ""
"<b>Window activation:</b> <i>Focus on click</i>"
"<br><b>Titlebar double-click:</b> <i>Shade window</i>"
-"<br><b>Mouse selection:</b> <i>Single click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
-"<br><b>Keyboard scheme:</b> <i>TDE default</i>"
+"<br><b>Mouse selection:</b> <i>Double click</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
+"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
"<br>"
msgstr ""
"<b>窗口激活:</b> <i>单击置为焦点</i>"
"<br><b>双击标题栏:</b> <i>卷起窗口</i>"
-"<br><b>鼠标选择:</b> <i>单击</i>"
-"<br><b>应用程序启动通知:</b> <i>沙漏</i>"
-"<br><b>键盘模式:</b> <i>TDE 默认方式</i>"
+"<br><b>鼠标选择:</b> <i>双击</i>"
+"<br><b>应用程序启动通知:</b> <i>无</i>"
+"<br><b>键盘模式:</b> <i>Mac</i>"
"<br>"
#: kospage.cpp:364
@@ -193,11 +62,12 @@ msgstr ""
"<br>"
#: kospage.cpp:376
+#, fuzzy
msgid ""
"<b>Window activation:</b> <i>Focus on click</i>"
"<br><b>Titlebar double-click:</b> <i>Maximize window</i>"
"<br><b>Mouse selection:</b> <i>Double click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
"<br><b>Keyboard scheme:</b> <i>Windows</i>"
"<br>"
msgstr ""
@@ -224,85 +94,71 @@ msgstr ""
"<br><b>键盘模式:</b> <i>Mac</i>"
"<br>"
-#: keyecandypage.cpp:67
-msgid "Features"
-msgstr "特效"
-
-#: keyecandypage.cpp:71
-msgid "Desktop Wallpaper"
-msgstr "桌面墙纸"
-
-#: keyecandypage.cpp:73
-msgid "Window Moving/Resizing Effects"
-msgstr "窗口移动/改变大小特效"
-
-#: keyecandypage.cpp:75
-msgid "Display Contents in Moving/Resizing Windows"
-msgstr "窗口移动/改变大小时仍显示内容"
-
-#: keyecandypage.cpp:78
-msgid "File Manager Background Picture"
-msgstr "文件管理器背景图片"
+#: tdestylepage.cpp:50
+msgid "Style"
+msgstr "风格"
-#: keyecandypage.cpp:80
-msgid "Panel Background Picture"
-msgstr "TDE 面板背景图片"
+#: tdestylepage.cpp:51
+msgid "Description"
+msgstr "描述"
-#: keyecandypage.cpp:83
-msgid "Panel Icon Popups"
-msgstr "面板图标弹出"
+#: tdestylepage.cpp:55
+msgid "Plastik"
+msgstr "塑料"
-#: keyecandypage.cpp:85
-msgid "Icon Highlighting"
-msgstr "图标加亮"
+#: tdestylepage.cpp:55
+msgid "Light"
+msgstr "光线"
-#: keyecandypage.cpp:87
-msgid "File Manager Icon Animation"
-msgstr "文件管理器图标动画"
+#: tdestylepage.cpp:56
+msgid "TDE default style"
+msgstr "TDE 默认风格"
-#: keyecandypage.cpp:90
-msgid "Sound Theme"
-msgstr "配乐方案"
+#: tdestylepage.cpp:59
+#, fuzzy
+msgid "KDE Classic"
+msgstr "TDE 经典"
-#: keyecandypage.cpp:96
-msgid "Large Desktop Icons"
-msgstr "大桌面图标"
+#: tdestylepage.cpp:60
+#, fuzzy
+msgid "Classic KDE style"
+msgstr "TDE 经典风格"
-#: keyecandypage.cpp:98
-msgid "Large Panel Icons"
-msgstr "大面板图标"
+#: tdestylepage.cpp:63
+msgid "Keramik"
+msgstr "Keramik"
-#: keyecandypage.cpp:102
-msgid "Smoothed Fonts (Antialiasing)"
-msgstr "平滑字体(反锯齿)"
+#: tdestylepage.cpp:64
+msgid "The previous default style"
+msgstr "先前的默认风格"
-#: keyecandypage.cpp:106
-msgid "Preview Images"
-msgstr "预览图像"
+#: tdestylepage.cpp:67
+msgid "Sunshine"
+msgstr "阳光"
-#: keyecandypage.cpp:108
-msgid "Icons on Buttons"
-msgstr "按钮上的图标"
+#: tdestylepage.cpp:68
+msgid "A very common desktop"
+msgstr "非常普通的桌面"
-#: keyecandypage.cpp:112
-msgid "Animated Combo Boxes"
-msgstr "动画效果的组合框"
+#: tdestylepage.cpp:71
+msgid "Redmond"
+msgstr "Redmond"
-#: keyecandypage.cpp:116
-msgid "Fading Tooltips"
-msgstr "淡入淡出工具提示"
+#: tdestylepage.cpp:72
+msgid "A style from the northwest of the USA"
+msgstr "来自美国西北某地的风格"
-#: keyecandypage.cpp:119
-msgid "Preview Text Files"
-msgstr "预览文本文件"
+#: tdestylepage.cpp:75
+msgid "Platinum"
+msgstr "白金"
-#: keyecandypage.cpp:122
-msgid "Fading Menus"
-msgstr "淡入淡出菜单"
+#: tdestylepage.cpp:76
+msgid "The platinum style"
+msgstr "白金风格"
-#: keyecandypage.cpp:124
-msgid "Preview Other Files"
-msgstr "预览其它文件"
+#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
+msgid "without name"
+msgstr "没有名字"
#. i18n: file kcountrypagedlg.ui line 64
#: rc.cpp:3
@@ -312,17 +168,17 @@ msgstr "请选择您使用的语言:"
#. i18n: file kcountrypagedlg.ui line 82
#: rc.cpp:6
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"<p>This Personalizer will help you configure the basic setup of your TDE "
+"<p>This Personalizer will help you configure the basic setup of your Trinity "
"desktop in five quick, easy steps. You can set things like your country (for "
"date and time formats, etc.), language, desktop behavior and more.</p>\n"
-"<p>You will be able to change all the settings later using the TDE Control "
+"<p>You will be able to change all the settings later using the Trinity Control "
"Center. You may choose to postpone your personalization until later by clicking "
"on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
"for the country and language settings. However, new users are encouraged to use "
"this simple method.</p>\n"
-"<p>If you already like your TDE configuration and wish to quit the Wizard, "
+"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
"click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
msgstr ""
"<p>个性化向导将协助您经过简便快捷的五个步骤,完成您 TDE "
@@ -333,8 +189,8 @@ msgstr ""
#. i18n: file kcountrypagedlg.ui line 100
#: rc.cpp:11
-#, no-c-format
-msgid "<h3>Welcome to TDE %VERSION%!</h3>"
+#, fuzzy, no-c-format
+msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
msgstr "<h3>欢迎使用 TDE %VERSION%!</h3>"
#. i18n: file kcountrypagedlg.ui line 148
@@ -345,11 +201,11 @@ msgstr "请选择您所在的国家或地区:"
#. i18n: file keyecandypagedlg.ui line 64
#: rc.cpp:17
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"<P>TDE offers many visually appealing special effects, such as smoothed fonts, "
-"previews in the file manager and animated menus. All this beauty, however, "
-"comes at a small performance cost. </P>\n"
+"<P>Trinity offers many visually appealing special effects, such as smoothed "
+"fonts, previews in the file manager and animated menus. All this beauty, "
+"however, comes at a small performance cost. </P>\n"
"If you have a fast, new processor, you might want to turn them all on, but for "
"those of us with slower processors, starting off with less eye candy helps to "
"keep your desktop more responsive."
@@ -433,12 +289,12 @@ msgstr "Apple MacOS (R)"
#. i18n: file kospagedlg.ui line 126
#: rc.cpp:56
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"<b>System Behavior</b>"
"<br>\n"
"Graphical User Interfaces behave differently on various Operating Systems.\n"
-"TDE allows you to customize its behavior according to your needs."
+"Trinity allows you to customize its behavior according to your needs."
msgstr ""
"<b>系统行为</b>"
"<br>\n"
@@ -447,10 +303,10 @@ msgstr ""
#. i18n: file kospagedlg.ui line 168
#: rc.cpp:61
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"For motion impaired users, TDE provides keyboard gestures to activate special "
-"keyboard settings."
+"For motion impaired users, Trinity provides keyboard gestures to activate "
+"special keyboard settings."
msgstr "对于行动不便的用户,TDE 提供了键盘手势来激活特殊的键盘设置。"
#. i18n: file kospagedlg.ui line 179
@@ -490,58 +346,213 @@ msgstr "您也可以使用下面的按钮来启动 TDE 控制中心。"
msgid "&Launch Trinity Control Center"
msgstr "启动 TDE 控制中心(&L)"
-#. i18n: file kstylepagedlg.ui line 32
-#: rc.cpp:80
-#, no-c-format
-msgid ""
-"Please choose the way your computer should look by selecting one of the items "
-"below."
-msgstr "请用下面的选项选择您电脑的外观风格。"
-
-#. i18n: file kstylepagedlg.ui line 89
-#: rc.cpp:83
-#, no-c-format
-msgid "Preview"
-msgstr "预览"
-
#. i18n: file stylepreview.ui line 42
-#: rc.cpp:86
+#: rc.cpp:80
#, no-c-format
msgid "Tab 1"
msgstr "标签 1"
#. i18n: file stylepreview.ui line 61
-#: rc.cpp:89
+#: rc.cpp:83
#, no-c-format
msgid "Button"
msgstr "按钮"
#. i18n: file stylepreview.ui line 72
-#: rc.cpp:92
+#: rc.cpp:86
#, no-c-format
msgid "ComboBox"
msgstr "组合框"
#. i18n: file stylepreview.ui line 92
-#: rc.cpp:95
+#: rc.cpp:89
#, no-c-format
msgid "Button Group"
msgstr "按钮组"
#. i18n: file stylepreview.ui line 103
-#: rc.cpp:98 rc.cpp:101
+#: rc.cpp:92 rc.cpp:95
#, no-c-format
msgid "RadioButton"
msgstr "单选钮"
#. i18n: file stylepreview.ui line 136
-#: rc.cpp:104
+#: rc.cpp:98
#, no-c-format
msgid "CheckBox"
msgstr "复选框"
#. i18n: file stylepreview.ui line 165
-#: rc.cpp:107
+#: rc.cpp:101
#, no-c-format
msgid "Tab 2"
msgstr "标签 2"
+
+#. i18n: file tdestylepagedlg.ui line 32
+#: rc.cpp:104
+#, no-c-format
+msgid ""
+"Please choose the way your computer should look by selecting one of the items "
+"below."
+msgstr "请用下面的选项选择您电脑的外观风格。"
+
+#. i18n: file tdestylepagedlg.ui line 89
+#: rc.cpp:107
+#, no-c-format
+msgid "Preview"
+msgstr "预览"
+
+#: keyecandypage.cpp:69
+msgid "Features"
+msgstr "特效"
+
+#: keyecandypage.cpp:73
+msgid "Desktop Wallpaper"
+msgstr "桌面墙纸"
+
+#: keyecandypage.cpp:75
+msgid "Window Moving/Resizing Effects"
+msgstr "窗口移动/改变大小特效"
+
+#: keyecandypage.cpp:77
+msgid "Display Contents in Moving/Resizing Windows"
+msgstr "窗口移动/改变大小时仍显示内容"
+
+#: keyecandypage.cpp:80
+msgid "File Manager Background Picture"
+msgstr "文件管理器背景图片"
+
+#: keyecandypage.cpp:82
+msgid "Panel Background Picture"
+msgstr "TDE 面板背景图片"
+
+#: keyecandypage.cpp:85
+msgid "Panel Icon Popups"
+msgstr "面板图标弹出"
+
+#: keyecandypage.cpp:87
+msgid "Icon Highlighting"
+msgstr "图标加亮"
+
+#: keyecandypage.cpp:89
+msgid "File Manager Icon Animation"
+msgstr "文件管理器图标动画"
+
+#: keyecandypage.cpp:92
+msgid "Sound Theme"
+msgstr "配乐方案"
+
+#: keyecandypage.cpp:98
+msgid "Large Desktop Icons"
+msgstr "大桌面图标"
+
+#: keyecandypage.cpp:100
+msgid "Large Panel Icons"
+msgstr "大面板图标"
+
+#: keyecandypage.cpp:104
+msgid "Smoothed Fonts (Antialiasing)"
+msgstr "平滑字体(反锯齿)"
+
+#: keyecandypage.cpp:108
+msgid "Preview Images"
+msgstr "预览图像"
+
+#: keyecandypage.cpp:110
+msgid "Icons on Buttons"
+msgstr "按钮上的图标"
+
+#: keyecandypage.cpp:114
+msgid "Animated Combo Boxes"
+msgstr "动画效果的组合框"
+
+#: keyecandypage.cpp:118
+msgid "Fading Tooltips"
+msgstr "淡入淡出工具提示"
+
+#: keyecandypage.cpp:121
+msgid "Preview Text Files"
+msgstr "预览文本文件"
+
+#: keyecandypage.cpp:124
+msgid "Fading Menus"
+msgstr "淡入淡出菜单"
+
+#: keyecandypage.cpp:126
+msgid "Preview Other Files"
+msgstr "预览其它文件"
+
+#: kpersonalizer.cpp:67
+msgid "Step 1: Introduction"
+msgstr "第一步:简介"
+
+#: kpersonalizer.cpp:71
+msgid "Step 2: I want it my Way..."
+msgstr "第二步:做我自己..."
+
+#: kpersonalizer.cpp:75
+msgid "Step 3: Eyecandy-O-Meter"
+msgstr "第三步:视觉效果"
+
+#: kpersonalizer.cpp:79
+msgid "Step 4: Everybody loves Themes"
+msgstr "第四步:应用主题"
+
+#: kpersonalizer.cpp:83
+msgid "Step 5: Time to Refine"
+msgstr "第五步:细微调整"
+
+#: kpersonalizer.cpp:86
+msgid "S&kip Wizard"
+msgstr "跳过向导(&K)"
+
+#: kpersonalizer.cpp:152
+#, fuzzy
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to "
+"your personal liking.</p>"
+"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>您确定想要退出桌面设置向导吗?</p>"
+"<p>桌面设置向导可以帮助您配置 TDE 桌面来符合您的胃口。</p>"
+"<p>单击<b>取消</b>返回并继续您的设置。</p>"
+
+#: kpersonalizer.cpp:156
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>If yes, click <b>Quit</b> and all changes will be lost."
+"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>您确定想要退出桌面设置向导吗?</p>"
+"<p>如果是的话,单击<b>退出</b>就会丢弃所有更改。"
+"<br>如果不是的话,单击<b>取消</b>可以返回并继续您的设置。</p>"
+
+#: kpersonalizer.cpp:160
+msgid "All Changes Will Be Lost"
+msgstr "所有更改都将丢失"
+
+#: kcountrypage.cpp:48
+#, fuzzy
+msgid "<h3>Welcome to Trinity %1</h3>"
+msgstr "<h3>欢迎使用 TDE %1</h3>"
+
+#: kcountrypage.cpp:142
+msgid "All"
+msgstr "全部"
+
+#: main.cpp:27 main.cpp:38
+msgid "KPersonalizer"
+msgstr "个性化设置向导"
+
+#: main.cpp:31
+msgid "Personalizer is restarted by itself"
+msgstr "个性化向导自行重新启动"
+
+#: main.cpp:32
+#, fuzzy
+msgid "Personalizer is running before Trinity session"
+msgstr "在 TDE 会话前启动个性化向导"
+
+#~ msgid "<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</i><br><b>Application startup notification:</b> <i>busy cursor</i><br><b>Keyboard scheme:</b> <i>TDE default</i><br>"
+#~ msgstr "<b>窗口激活:</b> <i>单击置为焦点</i><br><b>双击标题栏:</b> <i>卷起窗口</i><br><b>鼠标选择:</b> <i>单击</i><br><b>应用程序启动通知:</b> <i>沙漏</i><br><b>键盘模式:</b> <i>TDE 默认方式</i><br>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kprinter.po b/tde-i18n-zh_CN/messages/tdebase/kprinter.po
index 11c6e3dcf35..caba1dbb329 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kprinter.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kprinter.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kprinter\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:09+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/krdb.po b/tde-i18n-zh_CN/messages/tdebase/krdb.po
index 83c31812e59..b4c4c47f395 100644
--- a/tde-i18n-zh_CN/messages/tdebase/krdb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/krdb.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: krdb\n"
-"POT-Creation-Date: 2006-05-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-01-12 22:51-0500\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po b/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
index 7f605dd389e..8133076d1a1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kreadconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:07+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/krunapplet.po b/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
index 428b6b745f3..bf1bc221f75 100644
--- a/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: krunapplet\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-12 00:53+0800\n"
"Last-Translator: Xie Yuheng <phycommusyee@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
index 229a4a6d977..025b7a3a441 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2007-03-07 02:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-02-09 11:06+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -48,39 +49,222 @@ msgstr ""
"启动“wm”。缺省是“twin”"
#: main.cpp:38
+msgid "Pass additional arguments to the window manager. Default is ''"
+msgstr ""
+
+#: main.cpp:39
msgid "Also allow remote connections"
msgstr "允许远程连接"
-#: main.cpp:182
+#: main.cpp:183
msgid "The TDE Session Manager"
msgstr "TDE 会话管理器"
-#: main.cpp:186
+#: main.cpp:187
msgid "Maintainer"
msgstr "维护者"
-#: shutdown.cpp:349
+#: shutdown.cpp:268
+msgid "Notifying applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:504 shutdown.cpp:535
+msgid "Skip Notification (%1)"
+msgstr ""
+
+#: shutdown.cpp:506
+msgid "Notifying remaining applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:509
+msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:516
+msgid "Ignore and Resume Logout"
+msgstr ""
+
+#: shutdown.cpp:524
+msgid "An application is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:527
+msgid "%3 is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:537
+msgid "Notifying applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:540
+msgid "Notifying applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:630
msgid "Logout canceled by '%1'"
msgstr "“%1”取消了注销"
-#: shutdowndlg.cpp:102
+#: shutdown.cpp:636
+#, fuzzy
+msgid "Logout canceled by user"
+msgstr "“%1”取消了注销"
+
+#: shutdown.cpp:695
+msgid "Forcing interacting application termination"
+msgstr ""
+
+#: shutdown.cpp:745
+msgid "Notifying remaining applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:775
+msgid "Synchronizing remote folders"
+msgstr ""
+
+#: shutdown.cpp:781 shutdowndlg.cpp:1279
+msgid "Saving your settings..."
+msgstr ""
+
+#: shutdown.cpp:831 shutdown.cpp:904
+msgid "Closing applications (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:834 shutdown.cpp:907
+msgid "Closing applications (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:915
+msgid "Terminating services..."
+msgstr ""
+
+#: shutdowndlg.cpp:728
msgid "End Session for \"%1\""
msgstr "结束“%1”的会话"
-#: shutdowndlg.cpp:128
+#: shutdowndlg.cpp:753
+msgid "Log out"
+msgstr ""
+
+#: shutdowndlg.cpp:784
msgid "&End Current Session"
msgstr "结束当前会话(&E)"
-#: shutdowndlg.cpp:136
-msgid "&Turn Off Computer"
-msgstr "关闭计算机(&T)"
+#: shutdowndlg.cpp:785
+msgid ""
+"<qt>"
+"<h3>End Current Session</h3>"
+"<p>Log out of the current session to login with a different user</p></qt>"
+msgstr ""
-#: shutdowndlg.cpp:144
-msgid "&Restart Computer"
+#: shutdowndlg.cpp:883
+msgid "&Freeze"
+msgstr ""
+
+#: shutdowndlg.cpp:895
+msgid "&Suspend"
+msgstr ""
+
+#: shutdowndlg.cpp:907
+msgid "&Hibernate"
+msgstr ""
+
+#: shutdowndlg.cpp:925
+#, fuzzy
+msgid "&Restart"
msgstr "重启计算机(&R)"
-#: shutdowndlg.cpp:164
+#: shutdowndlg.cpp:949 shutdowndlg.cpp:1025
msgid ""
"_: current option in boot loader\n"
" (current)"
msgstr " (当前)"
+
+#: shutdowndlg.cpp:965
+#, fuzzy
+msgid "&Turn Off"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:990
+msgid "&Turn Off Computer"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:991
+msgid ""
+"<qt>"
+"<h3>Turn Off Computer</h3>"
+"<p>Log out of the current session and turn off the computer</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:1002
+msgid "&Restart Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1003
+msgid ""
+"<qt>"
+"<h3>Restart Computer</h3>"
+"<p>Log out of the current session and restart the computer</p>"
+"<p>Hold the mouse button or the space bar for a short while to get a list of "
+"options what to boot</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:1039
+#, fuzzy
+msgid "&Freeze Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1047
+#, fuzzy
+msgid "&Suspend Computer"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:1055
+#, fuzzy
+msgid "&Hibernate Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1281
+msgid "Skip Notification"
+msgstr ""
+
+#: shutdowndlg.cpp:1282
+msgid "Abort Logout"
+msgstr ""
+
+#: shutdowndlg.cpp:1337
+msgid "Would you like to turn off your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1338
+msgid ""
+"This computer will turn off automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1344
+msgid "Would you like to reboot your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1346
+msgid "Would you like to reboot to \"%1\"?"
+msgstr ""
+
+#: shutdowndlg.cpp:1347
+msgid ""
+"This computer will reboot automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1351
+msgid "Would you like to end your current session?"
+msgstr ""
+
+#: shutdowndlg.cpp:1352
+msgid ""
+"This session will end\n"
+"after %1 seconds automatically."
+msgstr ""
+
+#: startupdlg.cpp:78
+msgid "Loading your settings"
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksplash.po b/tde-i18n-zh_CN/messages/tdebase/ksplash.po
index aa2ddb8988f..bb32f488d2f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksplash.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksplash.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: ksplash\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-18 21:47+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -57,13 +58,15 @@ msgid "KSplash"
msgstr "KSplash"
#: main.cpp:46
-msgid "TDE splash screen"
+#, fuzzy
+msgid "Trinity splash screen"
msgstr "TDE 启动画面"
#: main.cpp:48
+#, fuzzy
msgid ""
"(c) 2001 - 2003, Flaming Sword Productions\n"
-" (c) 2003 TDE developers"
+" (c) 2003 KDE developers"
msgstr ""
"(c) 2001 - 2003, Flaming Sword Productions\n"
" (c) 2003 TDE 开发者"
@@ -105,5 +108,6 @@ msgid "Restoring session"
msgstr "恢复会话"
#: themeengine/objkstheme.cpp:135
-msgid "TDE is up and running"
+#, fuzzy
+msgid "Trinity is up and running"
msgstr "TDE 启动完毕并正在运行"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po b/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
index 0c85a9b2421..27ef73fd89d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: ksplashthemes\n"
-"POT-Creation-Date: 2006-08-24 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-21 00:35+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,8 @@ msgid "TDE splash screen theme manager"
msgstr "TDE 飞溅屏幕主题管理器"
#: main.cpp:68
-msgid "(c) 2003 TDE developers"
+#, fuzzy
+msgid "(c) 2003 KDE developers"
msgstr "(c) 2003 TDE 开发者"
#: main.cpp:70
diff --git a/tde-i18n-zh_CN/messages/tdebase/kstart.po b/tde-i18n-zh_CN/messages/tdebase/kstart.po
index 35c2d307e9b..1bc6f888815 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kstart.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kstart.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kstart\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-17 11:52+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po b/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
index 4a3d38c43f3..fe7c9815198 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
@@ -6,27 +6,32 @@
msgid ""
msgstr ""
"Project-Id-Version: ksystemtrayapplet\n"
-"POT-Creation-Date: 2008-08-14 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-04-08 18:30+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: systemtrayapplet.cpp:205
+#: systemtrayapplet.cpp:237
msgid "Configure System Tray"
msgstr "配置系统托盘"
-#: systemtrayapplet.cpp:214
-msgid "Visible icons:"
-msgstr "可见图标:"
+#: systemtrayapplet.cpp:247
+msgid "Show Clock in Tray"
+msgstr ""
-#: systemtrayapplet.cpp:215
+#: systemtrayapplet.cpp:252
msgid "Hidden icons:"
msgstr "隐藏图标:"
-#: systemtrayapplet.cpp:726
+#: systemtrayapplet.cpp:253
+msgid "Visible icons:"
+msgstr "可见图标:"
+
+#: systemtrayapplet.cpp:844
msgid "Configure System Tray..."
msgstr "配置系统托盘..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po b/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
index d87b328a358..31a9dc2a2f2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: ksystraycmd\n"
-"POT-Creation-Date: 2006-08-12 04:01+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-07-17 10:09+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kthememanager.po b/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
index 0a32b140ba3..2c71bef5b70 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kthememanager\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-05 13:58+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ktip.po b/tde-i18n-zh_CN/messages/tdebase/ktip.po
index aa61f368b71..2a2008eb01d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ktip.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ktip.po
@@ -7,72 +7,34 @@
msgid ""
msgstr ""
"Project-Id-Version: ktip\n"
-"POT-Creation-Date: 2006-11-23 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-10 08:37+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: ktipwindow.cpp:32
-msgid "Useful tips"
-msgstr "有用的小提示"
-
-#: ktipwindow.cpp:36
-msgid "KTip"
-msgstr "KTip"
-
-#: ktipwindow.cpp:52
-msgid "Useful Tips"
-msgstr "有用的小提示"
-
-#: tips.cpp:3
+#: tips.txt:3
msgid ""
"<P>\n"
"There is a lot of information about TDE on the\n"
-"<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
-"also useful sites for major applications like\n"
-"<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
-"<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
-"which can be put to its full usage even outside TDE...\n"
-"</P>\n"
+"<A HREF=\"http://www.trinitydesktop.org/\">TDE web site</A>.</P>\n"
"<br>\n"
"<center>\n"
"<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
"</center>\n"
msgstr ""
-"<P>在 <A HREF=\"http://www.kde.org/\">TDE 的网站上</A>有许多关于 TDE "
-"的信息。另外,还有一些有用的网站是有关主要的应用程序的,如 <A HREF=\"http://www.konqueror.org/\">"
-"Konqueror</A>、<A HREF=\"http://www.koffice.org/\">KOffice</A> "
-"和 <A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,即使是在 TDE 以外的场合它也可以被充分利用……</P>"
-"<br>"
-"<center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
-#: tips.cpp:22
+#: tips.txt:14
+#, fuzzy
msgid ""
"<p>\n"
"TDE is translated into many languages. You can change the country and\n"
"language with the Control Center in \"Regional &amp; Accessibility\"\n"
"->.\"Country/Region &amp; Language\".\n"
"</p>\n"
-"<p>For more information about TDE translations and translators, see <a\n"
-"href=\"http://i18n.kde.org/\">http://i18n.kde.org</a>.\n"
-"</p>\n"
-"<br>\n"
"<center>\n"
"<img src=\"crystalsvg/48x48/apps/locale.png\">\n"
"<p align=\"right\"><em>Contributed by Andrea Rizzi</em></p>\n"
@@ -84,7 +46,7 @@ msgstr ""
"<center><img src=\"crystalsvg/48x48/apps/locale.png\"><p align=\"right\"><em>"
"Andrea Rizzi 投稿</em></p>\n"
-#: tips.cpp:38
+#: tips.txt:26
msgid ""
"<p>\n"
"You can minimize all your windows on the current desktop at once and\n"
@@ -103,7 +65,7 @@ msgstr ""
"<br>"
"<center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
-#: tips.cpp:51
+#: tips.txt:39
msgid ""
"<p>\n"
"If you temporarily need more screen real-estate, you can <strong>\"fold\n"
@@ -119,7 +81,7 @@ msgstr ""
"。另外,您若想让它自动隐藏,可以更改控制中心的设置(首选项->面板,隐藏标签)。</p>"
"<p>要获得关于 TDE 面板 Kicker 的更多信息,请参看 <a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
-#: tips.cpp:64
+#: tips.txt:52
#, fuzzy
msgid ""
"<p>\n"
@@ -139,7 +101,7 @@ msgstr ""
"<br>"
"<center><img src=\"crystalsvg/48x48/apps/klipper.png\"></center>\n"
-#: tips.cpp:79
+#: tips.txt:67
msgid ""
"<p>\n"
"The window list, which is accessible via an icon on the panel, provides a\n"
@@ -154,7 +116,7 @@ msgstr ""
"<br>"
"<center><img src=\"crystalsvg/48x48/apps/window_list.png\"></center>\n"
-#: tips.cpp:90
+#: tips.txt:78
msgid ""
"<p>The <b>\"Location\" label</b> in Konqueror is draggable.</p>\n"
"<p>This means you can create shortcuts (e.g. on the desktop or the panel)\n"
@@ -166,7 +128,7 @@ msgstr ""
"<p>这意味着您只要通过鼠标拖动,就可以创建快捷方式(比如,在桌面或者面板上)。您还可以把它拖到 Konsole 或者编辑区域,从而把 URL "
"填写进去(就像您可以让 Konqueror 显示链接和文件一样)。</p>\n"
-#: tips.cpp:99
+#: tips.txt:87
msgid ""
"<p>For quick access to TDEPrint Manager type\n"
"<strong>\"print:/manager\"</strong>... -- <em>\"Type where?\"</em>,\n"
@@ -191,7 +153,7 @@ msgstr ""
"<center><img src=\"crystalsvg/48x48/devices/printer1.png\"><p align=\"right\">"
"<em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:115
+#: tips.txt:103
msgid ""
"<p>\n"
"Double-clicking on the titlebar of any window \"shades\" it, which means\n"
@@ -210,7 +172,7 @@ msgstr ""
"href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">TDE 用户指南</a>。</p>"
"\n"
-#: tips.cpp:127
+#: tips.txt:115
msgid ""
"<p>\n"
"You can cycle through the windows on a virtual desktop by holding the\n"
@@ -227,11 +189,12 @@ msgstr ""
"<p>更多信息请参看<a href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">"
"TDE 用户指南</a>。</p>\n"
-#: tips.cpp:138
+#: tips.txt:126
+#, fuzzy
msgid ""
"<p>\n"
"You can assign <b>keyboard shortcuts</b> to your favorite applications in the\n"
-"TDE menu editor (K-menu->Settings->Menu Editor). Select the application\n"
+"TDE menu editor (TDE Menu->Settings->Menu Editor). Select the application\n"
"(e.g. Konsole), then click on the image next to \"Current shortcut\n"
"key:\". Press the key combination you want (say, Ctrl+Alt+K).\n"
"<p>That is it: now you can fire up Konsoles with Ctrl+Alt+K.</p>\n"
@@ -242,7 +205,7 @@ msgstr ""
"(比如 Konsole),然后单击“当前快捷键”旁边的图像。输入您想要使用的按键组合(比如 Ctrl+Alt+K)。</p>\n"
"<p>就这么简单!现在就用 Ctrl+Alt+K 来弹出 Konsole 吧!</p>\n"
-#: tips.cpp:148
+#: tips.txt:136
msgid ""
"<p>\n"
"You can configure the number of virtual desktops by adjusting the \"Number\n"
@@ -258,25 +221,32 @@ msgstr ""
"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
"ops\">TDE 用户指南</a>。</p>\n"
-#: tips.cpp:159
-msgid ""
-"<p>The TDE project was founded in October 1996 and had its first release,\n"
-"1.0, on July 12, 1998.</p>\n"
+#: tips.txt:147
+msgid ""
+"<p>The <b>Trinity Desktop Environment</b> was born as a fork of the\n"
+"K Desktop Environment version 3.5, which was originally written by the KDE "
+"Team,\n"
+"a world-wide network of software engineers committed to Free Software "
+"development.\n"
+"The name <i>Trinity</i> was chosen because the word means <i>Three</i> as in\n"
+"<i>continuation of KDE 3</i>.</p>\n"
+"<p>Since then, TDE has evolved to be an independent and standalone computer "
+"desktop\n"
+"environment project. The developers have molded the code to its own identity "
+"without\n"
+"giving up on the efficiency, productivity and traditional user interface "
+"experience\n"
+"characteristic of the original KDE 3 series.</p>\n"
+"<p>The KDE project was founded in October 1996 and was first released\n"
+"on July 12, 1998.</p>\n"
+"<p>TDE first release dates back to April 2010.</p>\n"
"<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
"documenting, proof-reading, translating, etc.) and financial or\n"
-"hardware donations. Please contact <a\n"
-" href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
-"if you are interested in donating, or <a\n"
-"href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
-"like to contribute in other ways.</p>\n"
+"hardware donations. Please contact the TDE team if you are interested in\n"
+"donating, or if you would like to contribute in other ways.</p>\n"
msgstr ""
-"<p>TDE 计划始于 1996 年十月,它的第一个版本 1.0 在 1998 年 7 月 12 日发布。</p>"
-"<p>您可以通过实际工作(编写程序、设计、编写文档、校对、翻译等)还有资金或者硬件捐助来<em>支持 TDE 计划</em>"
-"。如果您有兴趣,请联系 <a href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>"
-";如果您想要以其它方式为 TDE 做出贡献,请联系 <a href=\"mailto:kde-quality@kde.org\">"
-"kde-quality@kde.org</a>。</p>\n"
-#: tips.cpp:172
+#: tips.txt:167
msgid ""
"<p>TDE provides some shortcuts to change the size of a window:</p>\n"
"<table>"
@@ -316,12 +286,12 @@ msgstr ""
"<td>用鼠标右键单击最大化按钮</td>\n"
"</tr></table>\n"
-#: tips.cpp:186
+#: tips.txt:181
#, fuzzy
msgid ""
"<p>You can stay up to date with new developments in TDE and releases\n"
-"by regularly checking the web site <A\n"
-" HREF=\"http://www.kde.org\">http://www.kde.org</A>.</p>\n"
+"by regularly checking the <a href=\"http://www.trinitydesktop.org/\">"
+"TDE web site</A>.</p>\n"
"<BR>\n"
"<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center></p>\n"
msgstr ""
@@ -330,10 +300,11 @@ msgstr ""
"<BR>\n"
"<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center></p>\n"
-#: tips.cpp:195
+#: tips.txt:189
+#, fuzzy
msgid ""
"<p align=\"center\"><strong>TDEPrinting (I)</strong></p>\n"
-"<p><strong>kprinter</strong>, TDE's new printing utility supports\n"
+"<p><strong>tdeprinter</strong>, TDE's printing utility supports\n"
"different print subsystems. These subsystems differ very much\n"
"in their abilities.</p>\n"
"<p>Among the supported systems are:\n"
@@ -356,13 +327,13 @@ msgstr ""
"<li>通过外部程序打印(通用)。</li>\n"
"</ul>\n"
-#: tips.cpp:211
+#: tips.txt:205
+#, fuzzy
msgid ""
"<p align=\"center\"><strong>TDEPrinting (II)</strong></p>\n"
"<p>Not all print subsystems provide equal abilities\n"
"for TDEPrint to build on.</p>\n"
-"<p>The TDEPrinting Team\n"
-"recommends installing a <A\n"
+"<p>The TDE developers recommend installing a <A\n"
"HREF=\"http://www.cups.org/\"><strong>CUPS-based</strong></A>\n"
"software as the underlying print subsystem.</p>\n"
"<p> CUPS provides easy usage, powerful features, broad printer\n"
@@ -374,22 +345,18 @@ msgid ""
msgstr ""
"<p align=\"center\"><strong>TDEPrinting (II)</strong></p>"
"<p>并不是所有的打印子系统为 TDEPrint 提供的能力都相同。</p>"
-"<p>TDEPrinting 开发组"
-"强烈建议安装 <A HREF=\"http://www.cups.org/\"><strong>基于 CUPS</strong></A>"
-"的软件作为底层打印子系统。</p>"
+"<p>TDEPrinting 开发组强烈建议安装 <A HREF=\"http://www.cups.org/\"><strong>"
+"基于 CUPS</strong></A>的软件作为底层打印子系统。</p>"
"<p>CUPS 易于使用,功能强大,支持的打印机很多,设计也是最新的(基于IPP,“Internet 打印协议”)。其实用性在家用和大网络中都得到证实。</p>"
"<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:228
+#: tips.txt:221
#, fuzzy
msgid ""
"<p>\n"
"TDE is based on a well-designed C++ foundation. C++ is a programming\n"
"language well suited to desktop development. The TDE object model\n"
-"extends the power of C++ even further. See\n"
-" <a href=\"http://developer.kde.org/\">http://developer.kde.org/</a>\n"
-"for details.</p>"
-"<br>\n"
+"extends the power of C++ even further.\n"
"<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
msgstr ""
"<p>\n"
@@ -401,7 +368,7 @@ msgstr ""
"<br>\n"
"<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
-#: tips.cpp:239
+#: tips.txt:230
msgid ""
"<p>\n"
"You can use Konqueror to <strong>browse through tar archives</strong>,\n"
@@ -412,7 +379,7 @@ msgstr ""
"您可以用 Konqueror 来<strong>浏览 tar 归档文件</strong>,甚至是经过\n"
"压缩的。要解压缩它们您只需简单的把文件拖放到别的地方(例如另一个 Konqueror 窗口或者桌面)就可以。</p>\n"
-#: tips.cpp:247
+#: tips.txt:238
msgid ""
"<p>\n"
"You can cycle through the virtual desktops by holding the Ctrl key and\n"
@@ -427,9 +394,10 @@ msgstr ""
"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
"ops\">TDE 用户指南</a>。</p>\n"
-#: tips.cpp:257
+#: tips.txt:248
+#, fuzzy
msgid ""
-"<p>You can start <strong>kprinter</strong> as a standalone program\n"
+"<p>You can start <strong>tdeprinter</strong> as a standalone program\n"
"from any xterm, Konsole window or from the \"Run Command\" dialog (started\n"
"by pressing <i>Alt+F2</i>). Then select the file to print. You can print\n"
"as many items of different types as you want, all at once.\n"
@@ -447,9 +415,10 @@ msgstr ""
"<img src=\"crystalsvg/48x48/devices/printer1.png\"></center>\n"
"<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:269
+#: tips.txt:260
+#, fuzzy
msgid ""
-"<p>You may at any time switch <strong>kprinter</strong> to another\n"
+"<p>You may at any time switch <strong>tdeprinter</strong> to another\n"
"print subsystem \"on the fly\" (and you do not need to be root to do it.)\n"
"</p>\n"
"<p>Laptop users who frequently change to different environments may find\n"
@@ -467,11 +436,11 @@ msgstr ""
"</p>\n"
"<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:281
+#: tips.txt:272
#, fuzzy
msgid ""
"<P>\n"
-"TDE's help system can display not only TDE's own HTML-based help, but\n"
+"TDE's help system can display TDE's HTML-based help, but\n"
"also info and man pages.</P>\n"
"<p>For more ways of getting help, see <a\n"
"href=\"help:/khelpcenter/userguide/getting-help.html\">the TDE User\n"
@@ -485,7 +454,7 @@ msgstr ""
"<br>"
"<center><img src=\"crystalsvg/48x48/apps/khelpcenter.png\"></center>\n"
-#: tips.cpp:293
+#: tips.txt:284
msgid ""
"<P>Clicking with the right mouse button on panel icons or applets opens a\n"
"popup menu that allows you to move or remove the item, or add a new\n"
@@ -497,7 +466,7 @@ msgstr ""
"您可以选择移动或者删除该项目,或者添加一个新项目。</P>\n"
"<p>要获得关于自定义 TDE 面板 Kicker 的更多信息,请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
-#: tips.cpp:302
+#: tips.txt:293
msgid ""
"<P>If a toolbar is not large enough to display all buttons on it, you can\n"
"click on the small arrow at the far right end of the toolbar to see\n"
@@ -506,15 +475,15 @@ msgstr ""
"<P>如果一个工具栏没有足够的大小以显示它上面的所有按钮,\n"
"您可以点击工具栏右端的小箭头看到其余的按钮。</P>\n"
-#: tips.cpp:309
+#: tips.txt:300
+#, fuzzy
msgid ""
"<p>\n"
"Need comprehensive info about TDEPrinting?"
"<br> </p>\n"
"<p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field\n"
-"and get the\n"
-" TDEPrint Handbook\n"
-"displayed.</p> "
+"and get the TDEPrint Handbook</a>\n"
+"displayed.</p>\n"
"<center>\n"
"<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
msgstr ""
@@ -522,12 +491,11 @@ msgstr ""
"想要全面了解 TDEPrinting?"
"<br></p>\n"
"<p>在 Konqueror 地址栏中输入 <strong>help:/tdeprint/</strong>就可得到\n"
-" TDEPrint 手册"
-"。</p>\n"
+" TDEPrint 手册。</p>\n"
"<center>\n"
"<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
-#: tips.cpp:328
+#: tips.txt:311
msgid ""
"<P>You can run non-TDE applications without problems on a TDE\n"
"desktop. It is even possible to integrate them into the menu system.\n"
@@ -539,7 +507,7 @@ msgstr ""
"TDE 的“应用程序查找(KAppfinder)”程序将搜索已知程序\n"
"并将它们加入到菜单当中。</P>\n"
-#: tips.cpp:336
+#: tips.txt:319
msgid ""
"<p>You can quickly move the panel to another screen edge by \"grabbing\" it "
"with\n"
@@ -551,10 +519,11 @@ msgstr ""
"然后把它移动到您想放置的位置。</p>\n"
"<p>要获得关于个性化 TDE 面板 Kicker 的更多信息,请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
-#: tips.cpp:344
+#: tips.txt:327
+#, fuzzy
msgid ""
"<p>\n"
-"If you need to kill some time, TDE comes with an extensive collection\n"
+"If you want to kill some time, TDE comes with an extensive collection\n"
"of games.</p>"
"<br>\n"
"<center>\n"
@@ -567,7 +536,7 @@ msgstr ""
"<center>\n"
"<img src=\"crystalsvg/48x48/apps/package_games.png\">\n"
-#: tips.cpp:353
+#: tips.txt:336
msgid ""
"<p>You can <strong>quickly change the background</strong> image of the\n"
"desktop by dragging a graphics image from a Konqueror window to the\n"
@@ -576,7 +545,7 @@ msgstr ""
"<p>只要把一幅图片从 Konqueror 窗口拖到桌面背景中,\n"
"您就可以<strong>快速改变桌面的背景图像</strong>。</p>\n"
-#: tips.cpp:360
+#: tips.txt:343
msgid ""
"<p>You can change the background color of the desktop by dragging a color\n"
"from a color selector in any application to the desktop background.\n"
@@ -586,7 +555,7 @@ msgstr ""
"您就可以改变桌面的背景颜色。\n"
"</p>\n"
-#: tips.cpp:367
+#: tips.txt:350
msgid ""
"<p>\n"
"A fast way to get your favorite application onto your panel is to\n"
@@ -599,7 +568,7 @@ msgstr ""
"右键点击面板(面板菜单)然后选择“添加到面板->应用程序->任何东西”。\n"
"</p>\n"
-#: tips.cpp:375
+#: tips.txt:358
msgid ""
"<p>\n"
"You can add more applets to your panel by selecting Panel\n"
@@ -611,7 +580,7 @@ msgstr ""
"小程序到您的面板中。\n"
"</p>\n"
-#: tips.cpp:383
+#: tips.txt:366
msgid ""
"<p>\n"
"You can add a little command line to your panel by selecting Panel\n"
@@ -626,7 +595,7 @@ msgstr ""
"</p>\n"
"<p>要获得关于 TDE 面板中可用的其它小程序,请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
-#: tips.cpp:393
+#: tips.txt:376
msgid ""
"<p>Want to see the local time of your friends or\n"
"business partners <b>around the world</b>?</p>\n"
@@ -635,7 +604,7 @@ msgstr ""
"<p>想要看到<b>世界各地</b>朋友或合作伙伴的本地时间吗?</p>\n"
"<p>只需用鼠标中键单击<b>时钟面板</b>。</p>\n"
-#: tips.cpp:400
+#: tips.txt:383
msgid ""
"<p>Your <b>panel clock</b> can be configured to display the time\n"
"in <b>plain</b>, <b>digital</b>, <b>analog</b> or <b>fuzzy-style</b>\n"
@@ -647,7 +616,7 @@ msgstr ""
"<b>模拟钟</b>或<b>模糊方式</b>显示时间。</p>\n"
"<p>更多信息请参看 <a href=\"help:/kicker/clock-applet.html\">Kicker 手册</a>。</p>\n"
-#: tips.cpp:409
+#: tips.txt:392
msgid ""
"<p>\n"
"If you know its name, you can <strong>execute any program</strong> by pressing\n"
@@ -665,7 +634,7 @@ msgstr ""
"<center>\n"
"<img src=\"crystalsvg/48x48/apps/kmenu.png\">\n"
-#: tips.cpp:420
+#: tips.txt:403
msgid ""
"<p>\n"
"You can <strong>browse any URL</strong> by pressing\n"
@@ -685,7 +654,7 @@ msgstr ""
"<center>\n"
"<img src=\"crystalsvg/48x48/places/network.png\">\n"
-#: tips.cpp:431
+#: tips.txt:414
msgid ""
"<p>If you are using Konqueror and want to type another location into\n"
"the location field below the toolbar to get there, you can clear the\n"
@@ -700,7 +669,7 @@ msgstr ""
"标签左边的黑叉按钮快速清除整个区域并开始输入新内容。</p>\n"
"<p>您还可以按 Ctrl+L 打开一个对话框来输入另一个地址。</p>\n"
-#: tips.cpp:441
+#: tips.txt:424
#, fuzzy
msgid ""
"<p>\n"
@@ -721,7 +690,7 @@ msgstr ""
"<center>\n"
"<img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
-#: tips.cpp:452
+#: tips.txt:435
#, fuzzy
msgid ""
"<p>\n"
@@ -744,7 +713,7 @@ msgstr ""
"<center>\n"
"<img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
-#: tips.cpp:465
+#: tips.txt:448
msgid ""
"<p>\n"
"If you cannot access the titlebar, you can still <strong>move a window</strong>"
@@ -761,12 +730,13 @@ msgstr ""
"<br>\n"
"<p>当然,您可以用控制中心改变这一行为。</p>\n"
-#: tips.cpp:474
+#: tips.txt:457
+#, fuzzy
msgid ""
"<p> Want TDE's printing power in non-TDE apps? </p>\n"
-"<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
-"Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-" StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
+"<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+"Works with Firefox, Seamonkey, Epiphany, gv, Acrobat Reader,\n"
+"LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
"<center>\n"
"<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
"<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
@@ -779,7 +749,7 @@ msgstr ""
"<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
"<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:488
+#: tips.txt:468
msgid ""
"<p>\n"
"You can <strong>resize a window</strong> on the screen by holding the Alt key,\n"
@@ -789,7 +759,7 @@ msgstr ""
"您可以按住 Alt 键,然后鼠标右点窗口中的任何地方并拖动它,\n"
"来<strong>改变窗口的大小</strong>。</p>\n"
-#: tips.cpp:495
+#: tips.txt:475
msgid ""
"<p>\n"
"TDE's mail client (KMail) provides seamless <strong>PGP/GnuPG\n"
@@ -804,21 +774,7 @@ msgstr ""
"<strong>PGP/GnuPG 集成</strong>。</p>\n"
"<p>关于设置加密的指示,请参看<a href=\"help:/kmail/pgp.html\">KMail 手册</a>。</p>\n"
-#: tips.cpp:505
-msgid ""
-"<p>\n"
-"You can find TDE developers all over the world, e.g., in Germany,\n"
-"Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
-"Norway!</p>\n"
-"<p>\n"
-"To see where TDE developers can be found, take a look at <a "
-"href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
-msgstr ""
-"<p>您可以在世界各地找到 TDE 的开发人员,例如在德国、瑞典、法国、加拿大、美国、澳大利亚、纳米比亚、阿根廷、挪威,当然也在中国!</p>"
-"<p>要查找 TDE 开发者的同乐会,请参看 <a href=\"http://worldwide.kde.org\">"
-"worldwide.kde.org</a>。</p>\n"
-
-#: tips.cpp:515
+#: tips.txt:485
msgid ""
"<p>\n"
"TDE's CD player, KsCD, accesses the Internet CD database freedb to provide you\n"
@@ -830,7 +786,7 @@ msgstr ""
"<p>TDE 的 CD 播放器 KsCD 通过 Internet CD 数据库 freedb 为您提供标题和音轨信息。</p>"
"<p>关于 KsCD 详细功能的介绍,请看 <a href=\"help:/kscd\">KsCD 手册</a>。</p>\n"
-#: tips.cpp:525
+#: tips.txt:495
msgid ""
"<p>\n"
"Some people open many terminal windows just to enter <em>one single</em>\n"
@@ -849,7 +805,7 @@ msgstr ""
"<li>如果您需要输出信息,使用控制台会话(工具栏中的“新建”)。\n"
"</ul>\n"
-#: tips.cpp:536
+#: tips.txt:506
msgid ""
"<p>\n"
"You can change the color of the window titlebars by clicking on the title bar "
@@ -864,11 +820,12 @@ msgstr ""
"</p>\n"
"<p>这也适合于其它可选的颜色。</p>\n"
-#: tips.cpp:545
+#: tips.txt:515
+#, fuzzy
msgid ""
"<p align=\"center\"><strong>TDE Command Line Printing (I)</strong></p>\n"
"<p> Want to print from command line, without missing TDE's printing power?</p>\n"
-"<p> Type <strong>'kprinter'</strong>. Up pops the\n"
+"<p> Type <strong>'tdeprinter'</strong>. Up pops the\n"
"TDEPrint dialog. Select printer, print options and\n"
"print files (note that you may select <em>different</em>\n"
"files of <em>different</em> types for <em>one</em> print job...). </p>\n"
@@ -883,14 +840,15 @@ msgstr ""
"<p>您可以在 Konsole,任何 X 终端,或“运行命令”\n"
"(按 <em>Alt+F2</em> 弹出)中执行。</p>\n"
-#: tips.cpp:557
+#: tips.txt:527
+#, fuzzy
msgid ""
"<p align=\"center\"><strong>TDE Command Line Printing (II)</strong></p>\n"
"<p>\n"
"You may specify print files and/or name a printer from the command line:\n"
"<pre>\n"
-"kprinter -d infotec \\\n /home/kurt/paragliding.jpg \\\n "
-"../tdeprint-handbook.pdf \\\n /opt/kde3/flyer.ps\n"
+"tdeprinter -d infotec \\\n /home/kurt/paragliding.jpg \\\n "
+"../tdeprint-handbook.pdf \\\n /opt/trinity/flyer.ps\n"
"</pre>\n"
" This prints 3 different files (from different folders) to printer "
"\"infotec\".\n"
@@ -907,7 +865,7 @@ msgstr ""
"<center><img src=\"crystalsvg/48x48/devices/printer1.png\"><p align=\"right\">"
"<em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:575
+#: tips.txt:545
msgid ""
"<p>\n"
"The difference between window manager styles and old-fashioned themes is\n"
@@ -916,35 +874,19 @@ msgid ""
msgstr ""
"<p>窗口管理器风格和老式的主题之间的区别是,前者甚至可以通过控制中心改变窗口标题栏的颜色设置并且可能实现不同的特性。</p>\n"
-#: tips.cpp:583
+#: tips.txt:553
msgid ""
"<p>\n"
-"The K in TDE does not stand for anything. It is the character that comes\n"
-"before L in the Latin alphabet, which stands for Linux. It was chosen\n"
-"because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
-"</p>\n"
+"The K in KDE did not stand for anything special. The K was the\n"
+"character that came before L in the Latin alphabet, which stands for Linux.\n"
+"The K was chosen because KDE ran on many types of UNIX and FreeBSD.\n"
+"The T in TDE does stand for something special. The T stands for Trinity\n"
+"which means three because Trinity is a continuation of the KDE 3.5 code base.\n"
+"The T also represents the name of the Trinity project that brought you this\n"
+"desktop environment. TDE also runs on many types of UNIX and FreeBSD.</p>\n"
msgstr ""
-"<p>TDE 中的字母 K 不代表任何意思。它是拉丁字母表中 L 的前一个字母,L 代表 Linux。选择它是因为 TDE 能够运行在许多种 Unix "
-"系统中(在 FreeBSD 中也非常完美)。</p>\n"
-#: tips.cpp:592
-#, fuzzy
-msgid ""
-"<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
-"look for the release schedule on <a\n"
-" href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
-"find old release schedules, there will probably be some weeks/months of\n"
-"intensive development left before the next release.</p>"
-"<br>\n"
-"<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
-msgstr ""
-"<p>如果您想知道<b>下一版</b>的 TDE 计划在什么时候发布,请看看 <a href=\"http://developer.kde.org/\">"
-"http://developer.kde.org</a> "
-"上的发布时间表。如果您只找到旧的发布时间表,那么很可能再经过几个星期或几个月的开发,下一个版本就会发布了。</p>"
-"<br>"
-"<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
-
-#: tips.cpp:602
+#: tips.txt:565
msgid ""
"<p>\n"
"Under the <em>\"B II\"</em> window decoration, the title bars\n"
@@ -958,7 +900,7 @@ msgstr ""
"您可以右键点击标题栏并选择“配置窗口行为...”\n"
"来改变您的标题栏的装饰。</p>\n"
-#: tips.cpp:611
+#: tips.txt:574
msgid ""
"<p>If you do not like the default completion mode (e.g. in Konqueror), you\n"
"can right-click on the edit-widget and choose a different mode, e.g.\n"
@@ -973,7 +915,7 @@ msgstr ""
"的 Shell。用 Ctrl+E 来调出它。\n"
"</p>\n"
-#: tips.cpp:621
+#: tips.txt:584
msgid ""
"<p>If you want another panel, to make more space for your applets and\n"
"buttons, press right mouse button on the panel to invoke the panel menu\n"
@@ -987,19 +929,20 @@ msgstr ""
"“添加到面板->面板->子面板”。</p>\n"
"<p>(然后您可以在新面板中放入任何东西或者调整它的尺寸等等。)</p>\n"
-#: tips.cpp:630
+#: tips.txt:593
+#, fuzzy
msgid ""
-"<p>If you want to contribute your own \"tip of the day\", please send it to\n"
-"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
-", and we will be happy to\n"
-" include\n"
-"it in the next release.</p>\n"
+"<p>If you want to contribute your own \"tip of the day\", please send the tip "
+"to\n"
+"<a href=\"trinity-devel@lists.pearsoncomputing.net\">"
+"trinity-devel@lists.pearsoncomputing.net</a>,\n"
+"and we will consider the tip for the next release.</p>\n"
msgstr ""
"<p>如果您想贡献您自己的“日积月累”,请将它发到\n"
"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
",我们将很高兴将它收集到下一个版本当中。</p>\n"
-#: tips.cpp:638
+#: tips.txt:600
msgid ""
"<p>\n"
"If you drag a file from Konqueror or from the desktop to Konsole, you\n"
@@ -1016,7 +959,7 @@ msgstr ""
"您只要选择其中之一即可,不必在终端窗口中输入整个路径。</p>\n"
"<p align=\"right\"><em>Gerard Delafond 投稿</em></p>\n"
-#: tips.cpp:649
+#: tips.txt:611
msgid ""
"<p>\n"
"You can hide mixer devices in KMix by clicking on \"Hide\" in the\n"
@@ -1035,7 +978,7 @@ msgstr ""
"<p>看看 <a href=\"help:/kmix\">KMix 手册</a>中更多有关 KMix 的提示和技巧。</p>\n"
"<p align=\"right\"><em>Stefan Schimanski 投稿</em></p>\n"
-#: tips.cpp:661
+#: tips.txt:623
msgid ""
"<p>\n"
"You can add your own \"Web Shortcuts\" to Konqueror by selecting\n"
@@ -1054,7 +997,7 @@ msgstr ""
"Konqueror 手册</a>。</p><p align=\"right\"><em> Michael Lachmann 和 Thomas Diehl "
"投稿</em></p>\n"
-#: tips.cpp:674
+#: tips.txt:636
msgid ""
"<p>\n"
"Each UNIX user has a so-called Home folder in which his or her\n"
@@ -1072,7 +1015,7 @@ msgstr ""
"</p>\n"
"<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
-#: tips.cpp:685
+#: tips.txt:647
msgid ""
"<p>\n"
"You might wonder why there are very few (if any) files whose\n"
@@ -1094,7 +1037,7 @@ msgstr ""
"</p>\n"
"<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
-#: tips.cpp:698
+#: tips.txt:660
msgid ""
"<p>\n"
"If you want to make your desktop look more interesting, you can find\n"
@@ -1109,7 +1052,7 @@ msgstr ""
"</p>\n"
"<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
-#: tips.cpp:707
+#: tips.txt:669
msgid ""
"<p>\n"
"Did you know that you can use the middle mouse button to paste\n"
@@ -1127,14 +1070,15 @@ msgstr ""
"</p>\n"
"<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
-#: tips.cpp:718
+#: tips.txt:680
+#, fuzzy
msgid ""
"<p>\n"
"Want to print by using \"DragNDrop\"?\n"
"</p>\n"
"<p>\n"
"Drag a file and drop it on the \"Files\" tab of an opened\n"
-"<strong>kprinter</strong> dialog. </p>\n"
+"<strong>tdeprinter</strong> dialog. </p>\n"
"<p>Then continue as you would normally: select a printer, job options, etc.\n"
"and click the \"Print\" button.\n"
"</p>\n"
@@ -1154,15 +1098,16 @@ msgstr ""
"<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
"<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
-#: tips.cpp:734
+#: tips.txt:696
+#, fuzzy
msgid ""
"<p>\n"
"If you need to calculate a distance on the screen, the program\n"
"<em>kruler</em> can be of great help.</p>\n"
"<p>\n"
"Furthermore, if you need to look closely at the ruler to count single\n"
-"pixels, <em>kmag</em> may be very useful. (It is not part of the TDE base\n"
-"installation but needs to be installed separately. It might already be\n"
+"pixels, <em>kmag</em> may be very useful. (<em>kmag</em> is part of the TDE\n"
+"Accessibility package. It might already be\n"
"available on your distribution.) <em>kmag</em> works\n"
"just like <em>xmag</em>, with the difference that it magnifies on the fly.\n"
"</p>\n"
@@ -1182,7 +1127,7 @@ msgstr ""
"<p align=\"right\"><em>Jesper Pedersen 投稿</em></p>"
"<br>\n"
-#: tips.cpp:749
+#: tips.txt:711
msgid ""
"<p>\n"
"Sound in TDE is coordinated by the <b>artsd</b> sound server. You can\n"
@@ -1200,7 +1145,7 @@ msgstr ""
"<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
"<br>\n"
-#: tips.cpp:759
+#: tips.txt:721
msgid ""
"<p>\n"
"You can associate sounds, pop up windows, and more with TDE events. This can be "
@@ -1218,7 +1163,7 @@ msgstr ""
"<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
"<br>\n"
-#: tips.cpp:768
+#: tips.txt:730
msgid ""
"<p>\n"
"Most non-TDE sound applications that do not know about the sound server can be\n"
@@ -1246,7 +1191,7 @@ msgstr ""
"<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
"<br>\n"
-#: tips.cpp:782
+#: tips.txt:744
msgid ""
"<p>\n"
"By holding down the <b>Shift</b> button while moving a container (button\n"
@@ -1259,10 +1204,11 @@ msgstr ""
"该容器就可以推动其它的容器。\n"
"</p>\n"
-#: tips.cpp:791
+#: tips.txt:753
+#, fuzzy
msgid ""
"<p>\n"
-"TDE's 'tdeioslaves' do not just work in Konqueror: you can use network\n"
+"TDE's 'tdeio slaves' do not just work in Konqueror: you can use network\n"
"URLs in any TDE application. For example, you can enter a URL like\n"
"ftp://www.server.com/myfile in the Kate Open dialog, and Kate will\n"
"open the file and save changes back to the FTP server when you click\n"
@@ -1273,7 +1219,7 @@ msgstr ""
"打开对话框中输入 URL ftp://www.server.com/myfile,而 Kate 就会打开该文件,并在您单击“保存”时将更改存回 FTP "
"服务器。</p>\n"
-#: tips.cpp:802
+#: tips.txt:764
msgid ""
"<p>\n"
"You can use Konqueror to access your files on any server that you have\n"
@@ -1289,7 +1235,7 @@ msgstr ""
"用户名</em>@<em>主机名</em>。</p>"
"<p>实际上,所有的 TDE 应用程序都支持 fish:// URL - 例如,您可以尝试在 Kate 的打开对话框中使用</p>\n"
-#: tips.cpp:815
+#: tips.txt:777
msgid ""
"<p>\n"
"KMail, the TDE email client, has built-in support for several popular\n"
@@ -1308,7 +1254,7 @@ msgstr ""
"<p>更多信息请参看 <a href=\"help:/kmail/the-anti-spam-wizard.html\">KMail 手册反垃圾向导一章</a>"
"。</p>\n"
-#: tips.cpp:830
+#: tips.txt:792
msgid ""
"<p>\n"
"You can make a window go below other windows by middle-clicking on its "
@@ -1317,7 +1263,7 @@ msgid ""
msgstr ""
"<p>用鼠标中键单击窗口的标题栏可将窗口推至最下方。</p>\n"
-#: tips.cpp:837
+#: tips.txt:799
msgid ""
"<p>\n"
"TDE applications offer short \"What's This?\" help texts for many\n"
@@ -1330,7 +1276,7 @@ msgstr ""
"应用程序会对很多特性提供简短的“这是什么?”帮助文本。只需单击窗口标题栏上的问号,然后再单击您想要获取帮助的项目。(在某些主题中,按钮会显示为小写的“i”而不是"
"问号)。</p>\n"
-#: tips.cpp:847
+#: tips.txt:809
msgid ""
"<p>\n"
"TDE supports several different window focus modes: take a look in the\n"
@@ -1340,7 +1286,7 @@ msgid ""
msgstr ""
"<p>TDE 支持多种不同的窗口焦点模式:您可以看看控制中心里的桌面->窗口行为。例如,如果您经常使用鼠标,可以试试“焦点跟随鼠标”设置。</p>\n"
-#: tips.cpp:856
+#: tips.txt:818
msgid ""
"<p>\n"
"Konqueror can continuously scroll webpages up or down: just press\n"
@@ -1349,27 +1295,26 @@ msgid ""
"</p>\n"
msgstr ""
-#: tips.cpp:865
+#: tips.txt:827
msgid ""
"<p>You can use Konqueror's help:/ tdeioslave to have quick and easy\n"
"access to an application's handbook by typing <b>help:/</b>, directly\n"
"followed by the application name, in the Location bar. So, for example\n"
-"to view the handbook for kwrite simply type help:/kwrite.</p> \n"
+"to view the handbook for kwrite simply type help:/kwrite.</p>\n"
msgstr ""
-#: tips.cpp:873
+#: tips.txt:835
msgid ""
-"<p>Thanks to the <a href=\"http://svg.kde.org\" title=\"ksvg\">KSVG\n"
-"project</a>, TDE now has full support for the Scalable Vector Graphics\n"
-"(SVG) image filetypes. You can view these images in Konqueror and even\n"
-"set an SVG image as a background for your desktop.</p>\n"
-"<p>There is also a great bunch of <a\n"
-"href=\"http://kdelook.org/index.php?xcontentmode=7\" title=\"kdelook\n"
+"<p>Thanks to the original KSVG project, TDE has full support for Scalable\n"
+"Vector Graphics (SVG) image filetypes. You can view these images in\n"
+"Konqueror and even set an SVG image as a background for your desktop.</p>\n"
+"<p>There is a great bunch of <a\n"
+"href=\"http://kde-look.org/index.php?xcontentmode=7\" title=\"kdelook\n"
"SVG\">SVG wallpapers</a> for your desktop background available at <a\n"
-"href=\"http://kdelook.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
+"href=\"http://kde-look.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
msgstr ""
-#: tips.cpp:885
+#: tips.txt:846
msgid ""
"<p>Konqueror's Web Shortcuts feature lets you submit a query directly\n"
"to a search engine without having to visit the website\n"
@@ -1381,22 +1326,22 @@ msgid ""
"Shortcuts icon.</p>\n"
msgstr ""
-#: tips.cpp:897
+#: tips.txt:858
msgid ""
-"<p>TDE is always looking to improve its accessibility, and with the\n"
-"launch of KTTS (TDE Text-to-Speech) you now have the power to convert\n"
+"<p>TDE developers are always looking to improve accessibility, and with\n"
+"KTTS (TDE Text-to-Speech) you have the power to convert\n"
"strings of text into audible speech. </p>\n"
-"<p>KTTS is constantly improving, and currently provides support to\n"
+"<p>KTTS currently provides support to\n"
"speak all or any portion of plain text files (as viewed in Kate), HTML\n"
"pages in Konqueror, text in the TDE clipboard, as well as speech of\n"
"TDE notifications (KNotify).</p>\n"
"<p>To start the KTTS system, you can either select KTTS in the TDE\n"
-"menu, or hit Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
+"menu, or press Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
"more information on KTTS, check the <a href=\"help:/kttsd\" title=\"KTTSD\n"
"Handbook\">KTTSD Handbook</a>.</p>\n"
msgstr ""
-#: tips.cpp:912
+#: tips.txt:873
msgid ""
"<p>Though TDE is a very stable desktop environment, programs may\n"
"occasionally freeze or crash, particularly if you are running the\n"
@@ -1411,7 +1356,7 @@ msgid ""
"used as a last resort.</p>\n"
msgstr ""
-#: tips.cpp:927
+#: tips.txt:888
msgid ""
"<p>KMail is TDE's email client, but did you know that you can\n"
"integrate it -- along with other programs -- to bring them all under\n"
@@ -1420,13 +1365,13 @@ msgid ""
"<p>Other possible programs to integrate with Kontact include\n"
"KAddressBook (for handling Contacts), KNotes (for keeping notes),\n"
"KNode (to keep up-to-date with the latest news), and KOrganizer (for a\n"
-"comprehensive calender).</p>\n"
+"comprehensive calendar).</p>\n"
msgstr ""
-#: tips.cpp:939
+#: tips.txt:900
msgid ""
"<p>You can use the mouse wheel to quickly perform a number of tasks;\n"
-"here are a few you might not have known of: \n"
+"here are a few you might not have known of:\n"
"<ul>"
"<li>Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-size,\n"
"or in Konqueror file manager to change icon size.</li>\n"
@@ -1437,22 +1382,22 @@ msgid ""
"desktop.</li></ul></p>\n"
msgstr ""
-#: tips.cpp:952
+#: tips.txt:913
msgid ""
"<p>By pressing F4 in Konqueror you can open a terminal at your current\n"
"location.</p>\n"
msgstr ""
-#: tips.cpp:958
+#: tips.txt:919
msgid ""
"<p>Although TDE will automatically restore your TDE programs that were\n"
"left open after you logged out, you can specifically tell TDE to start\n"
"particular applications on start up; see the <a\n"
-"href=\"help:/khelpcenter/faq/configure.html#id2574142\" title=\"Autostart\n"
+"href=\"help:/khelpcenter/faq/configure.html\" title=\"Autostart\n"
"FAQ\">FAQ entry</a> for more information.</p>\n"
msgstr ""
-#: tips.cpp:967
+#: tips.txt:928
msgid ""
"<p>You can integrate Kontact, TDE's Personal Information Management\n"
"suit, with Kopete, TDE's Instant Messenger client, so that you can\n"
@@ -1462,7 +1407,7 @@ msgid ""
"title=\"Integrated Messaging\">the TDE User Guide</a>.</p>\n"
msgstr ""
-#: tips.cpp:977
+#: tips.txt:938
msgid ""
"<p>By entering <b>kmail --composer</b> in Konsole you can\n"
"have KMail only open up the composer window, so that you do not have to\n"
@@ -1470,7 +1415,7 @@ msgid ""
"someone.</p>\n"
msgstr ""
-#: tips.cpp:985
+#: tips.txt:946
msgid ""
"<p>While remembering passwords may be tedious, and writing them down\n"
"on paper or in a text file may be insecure and untidy, TDEWallet is an\n"
@@ -1480,17 +1425,17 @@ msgid ""
"<p>TDEWallet can be accessed from kcontrol, TDE's Control Center; from\n"
"there, simply go to Security &amp; Privacy->TDE Wallet. For more\n"
"information on TDEWallet and on how to use it, check <a\n"
-"href=\"help:/tdewallet\" title=\"tdewallet\">the handbook</a>.</p>\n"
+"href=\"help:/tdewallet\" title=\"tdewallet\">the TDEWallet handbook</a>.</p>\n"
msgstr ""
-#: tips.cpp:998
+#: tips.txt:959
msgid ""
"<p>By pressing the Middle Mouse-Button on the desktop you can get a\n"
"brief list of all the windows on each desktop. From here you can also\n"
" unclutter or cascade the windows.</p>\n"
msgstr ""
-#: tips.cpp:1005
+#: tips.txt:966
msgid ""
"<p>Different virtual desktops can be customized individually, to a\n"
"certain extent. For example, you can specify a particular background\n"
@@ -1499,7 +1444,7 @@ msgid ""
"select Configure Desktop.</p>\n"
msgstr ""
-#: tips.cpp:1014
+#: tips.txt:975
msgid ""
"<p>While tabbed browsing in Konqueror is very useful, you can take\n"
"this one step further if you choose to have a split view in order to\n"
@@ -1511,7 +1456,7 @@ msgid ""
"some of the tabs where you might think it is useful.</p>\n"
msgstr ""
-#: tips.cpp:1026
+#: tips.txt:987
msgid ""
"<p>\n"
"You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
@@ -1535,3 +1480,82 @@ msgstr ""
"<hr>"
"<br>"
"<br><i>这是提示数据库中的最后一条提示。单击“下一条”将会将您带回到第一条提示。</i></p>\n"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: ktipwindow.cpp:32
+msgid "Useful tips"
+msgstr "有用的小提示"
+
+#: ktipwindow.cpp:36
+msgid "KTip"
+msgstr "KTip"
+
+#: ktipwindow.cpp:52
+msgid "Useful Tips"
+msgstr "有用的小提示"
+
+#~ msgid ""
+#~ "<P>\n"
+#~ "There is a lot of information about TDE on the\n"
+#~ "<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
+#~ "also useful sites for major applications like\n"
+#~ "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
+#~ "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
+#~ "<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
+#~ "which can be put to its full usage even outside TDE...\n"
+#~ "</P>\n"
+#~ "<br>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
+#~ "</center>\n"
+#~ msgstr "<P>在 <A HREF=\"http://www.kde.org/\">TDE 的网站上</A>有许多关于 TDE 的信息。另外,还有一些有用的网站是有关主要的应用程序的,如 <A HREF=\"http://www.konqueror.org/\">Konqueror</A>、<A HREF=\"http://www.koffice.org/\">KOffice</A> 和 <A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,即使是在 TDE 以外的场合它也可以被充分利用……</P><br><center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
+
+#~ msgid ""
+#~ "<p>The TDE project was founded in October 1996 and had its first release,\n"
+#~ "1.0, on July 12, 1998.</p>\n"
+#~ "<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
+#~ "documenting, proof-reading, translating, etc.) and financial or\n"
+#~ "hardware donations. Please contact <a\n"
+#~ " href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
+#~ "if you are interested in donating, or <a\n"
+#~ "href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
+#~ "like to contribute in other ways.</p>\n"
+#~ msgstr "<p>TDE 计划始于 1996 年十月,它的第一个版本 1.0 在 1998 年 7 月 12 日发布。</p><p>您可以通过实际工作(编写程序、设计、编写文档、校对、翻译等)还有资金或者硬件捐助来<em>支持 TDE 计划</em>。如果您有兴趣,请联系 <a href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>;如果您想要以其它方式为 TDE 做出贡献,请联系 <a href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a>。</p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can find TDE developers all over the world, e.g., in Germany,\n"
+#~ "Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
+#~ "Norway!</p>\n"
+#~ "<p>\n"
+#~ "To see where TDE developers can be found, take a look at <a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
+#~ msgstr "<p>您可以在世界各地找到 TDE 的开发人员,例如在德国、瑞典、法国、加拿大、美国、澳大利亚、纳米比亚、阿根廷、挪威,当然也在中国!</p><p>要查找 TDE 开发者的同乐会,请参看 <a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>。</p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "The K in TDE does not stand for anything. It is the character that comes\n"
+#~ "before L in the Latin alphabet, which stands for Linux. It was chosen\n"
+#~ "because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
+#~ "</p>\n"
+#~ msgstr "<p>TDE 中的字母 K 不代表任何意思。它是拉丁字母表中 L 的前一个字母,L 代表 Linux。选择它是因为 TDE 能够运行在许多种 Unix 系统中(在 FreeBSD 中也非常完美)。</p>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
+#~ "look for the release schedule on <a\n"
+#~ " href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
+#~ "find old release schedules, there will probably be some weeks/months of\n"
+#~ "intensive development left before the next release.</p><br>\n"
+#~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+#~ msgstr "<p>如果您想知道<b>下一版</b>的 TDE 计划在什么时候发布,请看看 <a href=\"http://developer.kde.org/\">http://developer.kde.org</a> 上的发布时间表。如果您只找到旧的发布时间表,那么很可能再经过几个星期或几个月的开发,下一个版本就会发布了。</p><br><center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po b/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
index bda1c14fff3..c74f6c87ce7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kwriteconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-09-01 21:56+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kxkb.po b/tde-i18n-zh_CN/messages/tdebase/kxkb.po
index 0ea485dc586..9f06c649f3c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kxkb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kxkb.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2006-04-06 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-12-03 21:56+0800\n"
"Last-Translator: Dick Zhang <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
index 005aad02376..b778702612f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libdmctrl\n"
-"POT-Creation-Date: 2007-11-02 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-14 05:46+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkicker.po b/tde-i18n-zh_CN/messages/tdebase/libkicker.po
index 8220355d508..e36fc7d9b0f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkicker.po
@@ -5,27 +5,28 @@
msgid ""
msgstr ""
"Project-Id-Version: libkicker\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-09 08:07+0800\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: panner.cpp:77
+#: panner.cpp:108
msgid "Scroll left"
msgstr "向左滚动"
-#: panner.cpp:78
+#: panner.cpp:109
msgid "Scroll right"
msgstr "向右滚动"
-#: panner.cpp:91
+#: panner.cpp:122
msgid "Scroll up"
msgstr "向上滚动"
-#: panner.cpp:92
+#: panner.cpp:123
msgid "Scroll down"
msgstr "向下滚动"
@@ -57,46 +58,80 @@ msgstr "启用此选项时,面板将变成半透明状"
#. i18n: file kickerSettings.kcfg line 30
#: rc.cpp:15
+#, fuzzy, no-c-format
+msgid "Enable resize handles"
+msgstr "启用着色背景。"
+
+#. i18n: file kickerSettings.kcfg line 31
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the panel will provide a resize handle on order to "
+"change its width via click-and-drag"
+msgstr "启用此选项时,面板将把平铺图像显示为背景"
+
+#. i18n: file kickerSettings.kcfg line 36
+#: rc.cpp:21
+#, no-c-format
+msgid "Make the task buttons push further into the screen when activated"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 41
+#: rc.cpp:24
#, no-c-format
msgid "Enable transparency for menubar panel"
msgstr "启用菜单栏面板透明"
-#. i18n: file kickerSettings.kcfg line 31
-#: rc.cpp:18
+#. i18n: file kickerSettings.kcfg line 42
+#: rc.cpp:27
#, no-c-format
msgid ""
"When this option is enabled, the panel containing the menubar will become "
"pseudo-transparent as well"
msgstr "启用此选项时,包含菜单栏的面板也将变成半透明"
-#. i18n: file kickerSettings.kcfg line 36
-#: rc.cpp:21
+#. i18n: file kickerSettings.kcfg line 47
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "Enable blurring for menubar panel"
+msgstr "启用菜单栏面板透明"
+
+#. i18n: file kickerSettings.kcfg line 48
+#: rc.cpp:33
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the panel containing the menubar will blur "
+"pseudo-transparent image"
+msgstr "启用此选项时,包含菜单栏的面板也将变成半透明"
+
+#. i18n: file kickerSettings.kcfg line 53
+#: rc.cpp:36
#, no-c-format
msgid "Enable background image"
msgstr "启用背景图像"
-#. i18n: file kickerSettings.kcfg line 37
-#: rc.cpp:24
+#. i18n: file kickerSettings.kcfg line 54
+#: rc.cpp:39
#, no-c-format
msgid ""
"When this option is enabled, the panel will display a tiled image as its "
"background"
msgstr "启用此选项时,面板将把平铺图像显示为背景"
-#. i18n: file kickerSettings.kcfg line 42
-#: rc.cpp:27
+#. i18n: file kickerSettings.kcfg line 59
+#: rc.cpp:42
#, no-c-format
msgid "Enable colourized background."
msgstr "启用着色背景。"
-#. i18n: file kickerSettings.kcfg line 47
-#: rc.cpp:30
+#. i18n: file kickerSettings.kcfg line 64
+#: rc.cpp:45
#, no-c-format
msgid "Rotate background"
msgstr "旋转背景"
-#. i18n: file kickerSettings.kcfg line 48
-#: rc.cpp:33
+#. i18n: file kickerSettings.kcfg line 65
+#: rc.cpp:48
#, no-c-format
msgid ""
"When this option is enabled, when the panel is placed on the side or top edges "
@@ -104,14 +139,14 @@ msgid ""
"orientation"
msgstr "启用此选项时,若面板放在屏幕的左右两侧或上侧,将会对背景图像进行旋转以便符合面板的方向"
-#. i18n: file kickerSettings.kcfg line 53
-#: rc.cpp:36
+#. i18n: file kickerSettings.kcfg line 70
+#: rc.cpp:51
#, no-c-format
msgid "Background image"
msgstr "背景图像"
-#. i18n: file kickerSettings.kcfg line 54
-#: rc.cpp:39
+#. i18n: file kickerSettings.kcfg line 71
+#: rc.cpp:54
#, no-c-format
msgid ""
"Here you can choose an image to be displayed on the panel. Press the 'browse' "
@@ -119,67 +154,73 @@ msgid ""
"if 'Enable background image' is selected"
msgstr "您可在此选择要在面板上显示的图像。按下“浏览”按钮可使用文件对话框选择主题。仅当“启用背景图像”选中时,此选项才生效"
-#. i18n: file kickerSettings.kcfg line 59
-#: rc.cpp:42
+#. i18n: file kickerSettings.kcfg line 76
+#: rc.cpp:57
#, no-c-format
msgid ""
"Controls the saturation level of the tint color used with transparent panels"
msgstr "控制对透明面板着色时的饱和度。"
-#. i18n: file kickerSettings.kcfg line 66
-#: rc.cpp:45
+#. i18n: file kickerSettings.kcfg line 83
+#: rc.cpp:60
#, no-c-format
msgid "The tint color used to colorize transparent panels"
msgstr "对透明面板着色所使用的颜色"
-#. i18n: file kickerSettings.kcfg line 68
-#: rc.cpp:48
+#. i18n: file kickerSettings.kcfg line 85
+#: rc.cpp:63
#, no-c-format
msgid "This option sets the color to use when tinting transparent panels"
msgstr "此选项选择了对透明面板着色时所使用的颜色"
-#. i18n: file kickerSettings.kcfg line 72
-#: rc.cpp:51
+#. i18n: file kickerSettings.kcfg line 89
+#: rc.cpp:66
#, no-c-format
msgid "Raise when the pointer touches the screen here"
msgstr "当指针指向屏幕此处时升起"
-#. i18n: file kickerSettings.kcfg line 77
-#: rc.cpp:54
+#. i18n: file kickerSettings.kcfg line 94
+#: rc.cpp:69
#, no-c-format
msgid "Fade out applet handles"
msgstr "淡出小程序把手"
-#. i18n: file kickerSettings.kcfg line 79
-#: rc.cpp:57
+#. i18n: file kickerSettings.kcfg line 96
+#: rc.cpp:72
#, no-c-format
msgid ""
"Select this option to make applet handles only visible on mouse hover. Applet "
"handles let you move, remove and configure applets."
msgstr "选择此选项将使得小程序把手仅当鼠标悬停时才可见。小程序把手可允许您移动、删除和配置小程序。"
-#. i18n: file kickerSettings.kcfg line 83
-#: rc.cpp:60
+#. i18n: file kickerSettings.kcfg line 100
+#: rc.cpp:75
#, no-c-format
msgid "Hide applet handles"
msgstr "隐藏小程序把手"
-#. i18n: file kickerSettings.kcfg line 85
-#: rc.cpp:63
+#. i18n: file kickerSettings.kcfg line 102
+#: rc.cpp:78
#, no-c-format
msgid ""
"Select this option to always hide the applet handles. Beware this could disable "
"moving, removing or configuring some applets."
msgstr "选择此选项将总是隐藏小程序把手。请注意,这也将禁止移动、删除或配置某些小程序。"
-#. i18n: file kickerSettings.kcfg line 89
-#: rc.cpp:66
+#. i18n: file kickerSettings.kcfg line 106
+#: rc.cpp:81
#, no-c-format
msgid "Show informational tooltips"
msgstr "显示信息性工具提示"
-#. i18n: file kickerSettings.kcfg line 94
-#: rc.cpp:69
+#. i18n: file kickerSettings.kcfg line 111
+#: rc.cpp:84
+#, no-c-format
+msgid "Show visual effect when panel icon is activated."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 116
+#: rc.cpp:87
#, no-c-format
msgid ""
"A list of applets that have been loaded at runtime. In the case of a crash "
@@ -187,8 +228,8 @@ msgid ""
"the crash"
msgstr "运行时装入的小程序列表。如果发生崩溃的话,这些小程序将不会在 Kicker 下次启动的时候装入,因为很可能是这些小程序造成的崩溃"
-#. i18n: file kickerSettings.kcfg line 98
-#: rc.cpp:72
+#. i18n: file kickerSettings.kcfg line 120
+#: rc.cpp:90
#, no-c-format
msgid ""
"A list of extensions that have been loaded at runtime. In the case of a crash "
@@ -196,263 +237,391 @@ msgid ""
"caused the crash"
msgstr "运行时装入的扩展列表。如果发生崩溃的话,这些扩展将不会在 Kicker 下次启动的时候装入,因为很可能是这些扩展造成的崩溃"
-#. i18n: file kickerSettings.kcfg line 108
-#: rc.cpp:75
+#. i18n: file kickerSettings.kcfg line 124
+#: rc.cpp:93
+#, fuzzy, no-c-format
+msgid "When this option is enabled, the classic TDE Menu is used."
+msgstr "启用此选项时,面板将变成半透明状"
+
+#. i18n: file kickerSettings.kcfg line 129
+#: rc.cpp:96
+#, fuzzy, no-c-format
+msgid "When this option is enabled, the Kickoff Menu opens on mouse hover."
+msgstr "启用此选项时,面板将变成半透明状"
+
+#. i18n: file kickerSettings.kcfg line 134
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the Kickoff Menu application view switching will "
+"scroll."
+msgstr "启用此选项时,面板将把平铺图像显示为背景"
+
+#. i18n: file kickerSettings.kcfg line 139
+#: rc.cpp:102 rc.cpp:105
+#, no-c-format
+msgid "Preferred width of the KMenu"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 149
+#: rc.cpp:108
+#, no-c-format
+msgid "With this option the scale of the fonts Kickoff uses can be influenced"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When this option is enabled, tdeabc is utilized to search for addresses. This "
+"may start KMail."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 161
+#: rc.cpp:114
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the Geeko eye moves when the mouse hovers the "
+"start menu button"
+msgstr "启用此选项时,面板将无法移动,您也无法删除或添加项目"
+
+#. i18n: file kickerSettings.kcfg line 168
+#: rc.cpp:117
+#, fuzzy, no-c-format
+msgid "Show names and icons on tabs"
+msgstr "细节项中先显示名称"
+
+#. i18n: file kickerSettings.kcfg line 171
+#: rc.cpp:120
+#, no-c-format
+msgid "Show only the names"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 174
+#: rc.cpp:123
+#, no-c-format
+msgid "Show only the icons"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 178
+#: rc.cpp:126
+#, no-c-format
+msgid "Appearace of the Kickoff tabbar"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 182
+#: rc.cpp:129
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the tabs in the Kickoff menu will switch without "
+"the need to click"
+msgstr "启用此选项时,包含菜单栏的面板也将变成半透明"
+
+#. i18n: file kickerSettings.kcfg line 194
+#: rc.cpp:132
#, no-c-format
msgid "Show simple menu entries"
msgstr "显示简单的菜单项"
-#. i18n: file kickerSettings.kcfg line 111
-#: rc.cpp:78
+#. i18n: file kickerSettings.kcfg line 197
+#: rc.cpp:135
#, no-c-format
msgid "Show names first on detailed entries"
msgstr "细节项中先显示名称"
-#. i18n: file kickerSettings.kcfg line 114
-#: rc.cpp:81
+#. i18n: file kickerSettings.kcfg line 200
+#: rc.cpp:138
#, no-c-format
msgid "Show only description for menu entries"
msgstr "只显示菜单项的描述"
-#. i18n: file kickerSettings.kcfg line 117
-#: rc.cpp:84
+#. i18n: file kickerSettings.kcfg line 203
+#: rc.cpp:141
#, no-c-format
msgid "Show detailed menu entries"
msgstr "显示更详细的菜单项"
-#. i18n: file kickerSettings.kcfg line 121
-#: rc.cpp:87
+#. i18n: file kickerSettings.kcfg line 207
+#: rc.cpp:144
#, no-c-format
msgid "Formation of the menu entry text"
msgstr "菜单项文本的格式"
-#. i18n: file kickerSettings.kcfg line 125
-#: rc.cpp:90
+#. i18n: file kickerSettings.kcfg line 211
+#: rc.cpp:147
#, no-c-format
msgid "Show section titles in Kmenu"
msgstr "在 KMenu 中显示节标题"
-#. i18n: file kickerSettings.kcfg line 130
-#: rc.cpp:93
+#. i18n: file kickerSettings.kcfg line 216
+#: rc.cpp:150
+#, no-c-format
+msgid "Simplify menus with only a single item inside"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 221
+#: rc.cpp:153
#, no-c-format
msgid "Height of menu entries in pixels"
msgstr "菜单项的像素高度"
-#. i18n: file kickerSettings.kcfg line 135
-#: rc.cpp:96
+#. i18n: file kickerSettings.kcfg line 226
+#: rc.cpp:156
#, no-c-format
msgid "Show hidden files in Quick Browser"
msgstr "在快速浏览器中显示隐藏文件"
-#. i18n: file kickerSettings.kcfg line 140
-#: rc.cpp:99
+#. i18n: file kickerSettings.kcfg line 231
+#: rc.cpp:159
#, no-c-format
msgid "Maximum number of entries"
msgstr "菜单的最多项数"
-#. i18n: file kickerSettings.kcfg line 146
-#: rc.cpp:102
+#. i18n: file kickerSettings.kcfg line 237
+#: rc.cpp:162
#, no-c-format
msgid "Show bookmarks in KMenu"
msgstr "在 KMenu 中显示书签"
-#. i18n: file kickerSettings.kcfg line 151
-#: rc.cpp:105
+#. i18n: file kickerSettings.kcfg line 242
+#: rc.cpp:165
#, no-c-format
msgid "Use the Quick Browser"
msgstr "使用快速浏览器"
-#. i18n: file kickerSettings.kcfg line 156
-#: rc.cpp:108
+#. i18n: file kickerSettings.kcfg line 247
+#: rc.cpp:168
#, no-c-format
msgid "Optional Menus"
msgstr "可选菜单"
-#. i18n: file kickerSettings.kcfg line 161
-#: rc.cpp:111
+#. i18n: file kickerSettings.kcfg line 252
+#: rc.cpp:171
#, no-c-format
msgid "Recently used applications"
msgstr "最近使用的应用程序"
-#. i18n: file kickerSettings.kcfg line 165
-#: rc.cpp:114
+#. i18n: file kickerSettings.kcfg line 256
+#: rc.cpp:174
#, no-c-format
msgid "Number of visible entries"
msgstr "可见项数"
-#. i18n: file kickerSettings.kcfg line 171
-#: rc.cpp:117
+#. i18n: file kickerSettings.kcfg line 262
+#: rc.cpp:177
#, no-c-format
msgid "Show most recently used applications rather than most frequently used"
msgstr "显示最近使用过的应用程序,而不是最常使用的应用程序"
-#. i18n: file kickerSettings.kcfg line 180
-#: rc.cpp:120
+#. i18n: file kickerSettings.kcfg line 267
+#: rc.cpp:180
+#, no-c-format
+msgid "The menu entries shown in the Favorites tab"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 271
+#: rc.cpp:183
+#, no-c-format
+msgid "Whether the panel has been started before or not"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 276
+#: rc.cpp:186
+#, no-c-format
+msgid "When the applications were first seen by Kickoff"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 284
+#: rc.cpp:189
#, no-c-format
msgid "Enable a tile background image for the KMenu button"
msgstr "启用 KMenu 按钮的平铺背景图像"
-#. i18n: file kickerSettings.kcfg line 185
-#: rc.cpp:123
+#. i18n: file kickerSettings.kcfg line 289
+#: rc.cpp:192
#, no-c-format
msgid "Enable a tile background image for the Desktop button"
msgstr "启用桌面按钮的平铺桌面图像"
-#. i18n: file kickerSettings.kcfg line 190
-#: rc.cpp:126
+#. i18n: file kickerSettings.kcfg line 294
+#: rc.cpp:195
#, no-c-format
msgid "Enable a tile background image for Application, URL and special buttons"
msgstr "启用应用程序、URL 和特殊按钮的平铺背景图像"
-#. i18n: file kickerSettings.kcfg line 195
-#: rc.cpp:129
+#. i18n: file kickerSettings.kcfg line 299
+#: rc.cpp:198
#, no-c-format
msgid "Enable a tile background image for the Quick Browser button"
msgstr "启用快速浏览器按钮的平铺背景图像"
-#. i18n: file kickerSettings.kcfg line 200
-#: rc.cpp:132
+#. i18n: file kickerSettings.kcfg line 304
+#: rc.cpp:201
#, no-c-format
msgid "Enable a tile background image for the Window List button"
msgstr "启用窗口列表按钮的平铺背景图像"
-#. i18n: file kickerSettings.kcfg line 205
-#: rc.cpp:135
+#. i18n: file kickerSettings.kcfg line 309
+#: rc.cpp:204
#, no-c-format
msgid "Image tile for Kmenu button background"
msgstr "KMenu 按钮背景的平铺图像"
-#. i18n: file kickerSettings.kcfg line 209
-#: rc.cpp:138 rc.cpp:144
+#. i18n: file kickerSettings.kcfg line 313
+#: rc.cpp:207 rc.cpp:213
#, no-c-format
msgid "Color to use for Kmenu button background"
msgstr "KMenu 按钮背景所用的颜色"
-#. i18n: file kickerSettings.kcfg line 214
-#: rc.cpp:141
+#. i18n: file kickerSettings.kcfg line 318
+#: rc.cpp:210
#, no-c-format
msgid "Image tile for Desktop button background"
msgstr "桌面按钮背景的平铺图像"
-#. i18n: file kickerSettings.kcfg line 223
-#: rc.cpp:147
+#. i18n: file kickerSettings.kcfg line 327
+#: rc.cpp:216
#, no-c-format
msgid "Image tile for Application, URL and special button backgrounds"
msgstr "应用程序、URL 和特殊按钮背景的平铺图像"
-#. i18n: file kickerSettings.kcfg line 227
-#: rc.cpp:150
+#. i18n: file kickerSettings.kcfg line 331
+#: rc.cpp:219
#, no-c-format
msgid "Color to use for Application, URL and special button backgrounds"
msgstr "应用程序、URL 和特殊按钮背景所使用的颜色"
-#. i18n: file kickerSettings.kcfg line 232
-#: rc.cpp:153
+#. i18n: file kickerSettings.kcfg line 336
+#: rc.cpp:222
#, no-c-format
msgid "Image tile for Browser button background"
msgstr "浏览器按钮背景的平铺图像"
-#. i18n: file kickerSettings.kcfg line 236
-#: rc.cpp:156
+#. i18n: file kickerSettings.kcfg line 340
+#: rc.cpp:225
#, no-c-format
msgid "Color to use for Browser button background"
msgstr "浏览器按钮背景所使用的颜色"
-#. i18n: file kickerSettings.kcfg line 241
-#: rc.cpp:159
+#. i18n: file kickerSettings.kcfg line 345
+#: rc.cpp:228
#, no-c-format
msgid "Image tile for Window List button background"
msgstr "窗口列表按钮背景的平铺图像"
-#. i18n: file kickerSettings.kcfg line 245
-#: rc.cpp:162
+#. i18n: file kickerSettings.kcfg line 349
+#: rc.cpp:231
#, no-c-format
msgid "Color to use for Window List button background"
msgstr "窗口列表按钮背景所使用的颜色"
-#. i18n: file kickerSettings.kcfg line 254
-#: rc.cpp:165
+#. i18n: file kickerSettings.kcfg line 358
+#: rc.cpp:234
#, no-c-format
msgid "Use side image in Kmenu"
msgstr "在 KMenu 中使用侧边图像"
-#. i18n: file kickerSettings.kcfg line 259
-#: rc.cpp:168
+#. i18n: file kickerSettings.kcfg line 363
+#: rc.cpp:237
+#, fuzzy, no-c-format
+msgid "Use Tooltip in Kmenu"
+msgstr "在 KMenu 中使用侧边图像"
+
+#. i18n: file kickerSettings.kcfg line 368
+#: rc.cpp:240
+#, fuzzy, no-c-format
+msgid "Show searh field in Kmenu"
+msgstr "在 KMenu 中显示节标题"
+
+#. i18n: file kickerSettings.kcfg line 373
+#: rc.cpp:243
#, no-c-format
msgid "The name of the file to use as the side image in the TDE Menu"
msgstr "在 K 菜单中用作侧边图像的文件名"
-#. i18n: file kickerSettings.kcfg line 264
-#: rc.cpp:171
+#. i18n: file kickerSettings.kcfg line 378
+#: rc.cpp:246
#, no-c-format
msgid ""
"The name of the file used as a tile to fill the height of TDE Menu that "
"SidePixmapName does not cover"
msgstr "用来填充 K 菜单中 SidePixmapName 无法覆盖的部分的文件名"
-#. i18n: file kickerSettings.kcfg line 269
-#: rc.cpp:174
+#. i18n: file kickerSettings.kcfg line 383
+#: rc.cpp:249
#, no-c-format
msgid "Show text on the TDE Menu button"
msgstr "在 K 菜单按钮上显示文本"
-#. i18n: file kickerSettings.kcfg line 274
-#: rc.cpp:177
+#. i18n: file kickerSettings.kcfg line 388
+#: rc.cpp:252
#, no-c-format
msgid "Text to be shown on TDE Menu Button"
msgstr "K 菜单按钮上要显示的文本"
-#. i18n: file kickerSettings.kcfg line 283
-#: rc.cpp:180
+#. i18n: file kickerSettings.kcfg line 393
+#: rc.cpp:255
+#, no-c-format
+msgid "Custom TDE Menu Button Icon"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 402
+#: rc.cpp:258
#, no-c-format
msgid "Enable icon mouse over effects"
msgstr "启用图标的鼠标悬停效果"
-#. i18n: file kickerSettings.kcfg line 288
-#: rc.cpp:183
+#. i18n: file kickerSettings.kcfg line 407
+#: rc.cpp:261
#, no-c-format
msgid "Show icons in mouse over effects"
msgstr "在鼠标悬停效果中显示图标"
-#. i18n: file kickerSettings.kcfg line 293
-#: rc.cpp:186
+#. i18n: file kickerSettings.kcfg line 412
+#: rc.cpp:264
#, no-c-format
msgid "Show text in mouse over effects"
msgstr "在鼠标悬停效果中显示文本"
-#. i18n: file kickerSettings.kcfg line 298
-#: rc.cpp:189
+#. i18n: file kickerSettings.kcfg line 417
+#: rc.cpp:267
#, no-c-format
msgid ""
"Controls how fast the tooltips fade in, measured in thousandths of a second"
msgstr "控制工具提示淡入的速度,以毫秒计"
-#. i18n: file kickerSettings.kcfg line 304
-#: rc.cpp:192
+#. i18n: file kickerSettings.kcfg line 423
+#: rc.cpp:270
#, no-c-format
msgid "Mouse over effects are shown after the defined time (in milliseconds)"
msgstr "鼠标悬停效果将在指定时间后显示(以毫秒计)"
-#. i18n: file kickerSettings.kcfg line 309
-#: rc.cpp:195
+#. i18n: file kickerSettings.kcfg line 428
+#: rc.cpp:273
#, no-c-format
msgid "Mouse over effects are hidden after the defined time (in milliseconds)"
msgstr "鼠标悬停效果将在指定时间后隐藏(以毫秒计)"
-#. i18n: file kickerSettings.kcfg line 314
-#: rc.cpp:198
+#. i18n: file kickerSettings.kcfg line 433
+#: rc.cpp:276
#, no-c-format
msgid "Enable background tiles"
msgstr "启用背景平铺"
-#. i18n: file kickerSettings.kcfg line 319
-#: rc.cpp:201
+#. i18n: file kickerSettings.kcfg line 438
+#: rc.cpp:279
#, no-c-format
msgid "The margin between panel icons and the panel border"
msgstr "面板图标和面板边框之间的距离"
-#. i18n: file kickerSettings.kcfg line 324
-#: rc.cpp:204
+#. i18n: file kickerSettings.kcfg line 443
+#: rc.cpp:282
+#, fuzzy, no-c-format
+msgid "The maximum height of the TDE Menu button in pixels"
+msgstr "在 K 菜单按钮上显示文本"
+
+#. i18n: file kickerSettings.kcfg line 448
+#: rc.cpp:285
#, no-c-format
msgid ""
"Buttons that represent KServices (applications, primarily) watch for the "
@@ -460,14 +629,14 @@ msgid ""
"turns this off."
msgstr "代表 KServices(主要是应用程序)的按钮会监视服务的删除并删除对应的按钮。此设置可关闭此功能。"
-#. i18n: file kickerSettings.kcfg line 329
-#: rc.cpp:207
+#. i18n: file kickerSettings.kcfg line 453
+#: rc.cpp:288
#, no-c-format
msgid "Font for the buttons with text."
msgstr "按钮文本的字体。"
-#. i18n: file kickerSettings.kcfg line 334
-#: rc.cpp:210
+#. i18n: file kickerSettings.kcfg line 458
+#: rc.cpp:291
#, no-c-format
msgid "Text color for the buttons."
msgstr "按钮文本的颜色。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
index 7b50f78f77e..0889f16a562 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_konsole\n"
-"POT-Creation-Date: 2006-02-23 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 11:57+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
index b7f73a9091e..fbb0eb7b673 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_prefmenu\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 11:58+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,8 @@ msgid "Settings"
msgstr "设置"
#: prefmenu.cpp:248
-msgid "Control Center"
+#, fuzzy
+msgid "Trinity Control Center"
msgstr "控制中心"
#: prefmenu.cpp:266
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
index 51dacf35b1e..26372a4836b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
@@ -5,18 +5,19 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_recentdocs\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 11:59+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: recentdocsmenu.cpp:53
+#: recentdocsmenu.cpp:55
msgid "Clear History"
msgstr "清空历史"
-#: recentdocsmenu.cpp:60
+#: recentdocsmenu.cpp:61
msgid "No Entries"
msgstr "没有条目"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
index e3308e79c9c..96da25e9d72 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_remotemenu\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
index 7d224a3ea09..b8640b56ecd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_systemmenu\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
index f47fb953360..19b93082b9e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_tdeprint 1.0\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-09-10 14:18+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
index 10ab79d8d0a..6d3eb0ab01f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libkickermenu_tom\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-05 14:01+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkonq.po b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
index 5bcca559529..f151c06f5d1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-09-26 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-20 01:39+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -106,168 +107,168 @@ msgstr "<p>您没有足够的权限读取 <b>%1</b></p>"
msgid "<p><b>%1</b> does not seem to exist anymore</p>"
msgstr "<p><b>%1</b> 似乎不再存在</p>"
-#: konq_dirpart.cc:491
+#: konq_dirpart.cc:495
#, c-format
msgid "Search result: %1"
msgstr "查找结果:%1"
-#: konq_operations.cc:269
+#: konq_operations.cc:271
#, c-format
msgid ""
"_n: Do you really want to delete this item?\n"
"Do you really want to delete these %n items?"
msgstr "您真的要删除这 %n 个项目吗?"
-#: konq_operations.cc:271
+#: konq_operations.cc:273
msgid "Delete Files"
msgstr "删除文件"
-#: konq_operations.cc:278
+#: konq_operations.cc:280
#, c-format
msgid ""
"_n: Do you really want to shred this item?\n"
"Do you really want to shred these %n items?"
msgstr "您真的要销毁这 %n 个项目吗?"
-#: konq_operations.cc:280
+#: konq_operations.cc:282
msgid "Shred Files"
msgstr "销毁文件"
-#: konq_operations.cc:281
+#: konq_operations.cc:283
msgid "Shred"
msgstr "销毁"
-#: konq_operations.cc:288
+#: konq_operations.cc:290
#, c-format
msgid ""
"_n: Do you really want to move this item to the trash?\n"
"Do you really want to move these %n items to the trash?"
msgstr "您真的要将这 %n 个项目移到回收站中吗?"
-#: konq_operations.cc:290
+#: konq_operations.cc:292
msgid "Move to Trash"
msgstr "移动到回收站"
-#: konq_operations.cc:291
+#: konq_operations.cc:293
msgid ""
"_: Verb\n"
"&Trash"
msgstr "放入回收站(&T)"
-#: konq_operations.cc:342
+#: konq_operations.cc:344
msgid "You cannot drop a folder on to itself"
msgstr "您不能将文件夹拖放到它自己上"
-#: konq_operations.cc:388
+#: konq_operations.cc:390
msgid "File name for dropped contents:"
msgstr "拖曳内容的文件名:"
-#: konq_operations.cc:567
+#: konq_operations.cc:575
msgid "&Move Here"
msgstr "移动至此处(&M)"
-#: konq_operations.cc:569
+#: konq_operations.cc:577
msgid "&Copy Here"
msgstr "复制至此处(&C)"
-#: konq_operations.cc:570
+#: konq_operations.cc:578
msgid "&Link Here"
msgstr "在此处创建链接(&L)"
-#: konq_operations.cc:572
+#: konq_operations.cc:580
msgid "Set as &Wallpaper"
msgstr "设为壁纸(&W)"
-#: konq_operations.cc:574
+#: konq_operations.cc:582
msgid "C&ancel"
msgstr "取消(&A)"
-#: konq_operations.cc:728 konq_operations.cc:730 konq_operations.cc:732
+#: konq_operations.cc:736 konq_operations.cc:738 konq_operations.cc:740
msgid "New Folder"
msgstr "新建文件夹"
-#: konq_operations.cc:733
+#: konq_operations.cc:741
msgid "Enter folder name:"
msgstr "输入文件夹名称:"
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
msgid "&Open"
msgstr "打开(&O)"
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
msgid "Open in New &Window"
msgstr "在新窗口中打开(&W)"
-#: konq_popupmenu.cc:478
+#: konq_popupmenu.cc:508
msgid "Open the trash in a new window"
msgstr "在新窗口中打开回收站"
-#: konq_popupmenu.cc:480
+#: konq_popupmenu.cc:510
msgid "Open the medium in a new window"
msgstr "在新窗口中打开介质"
-#: konq_popupmenu.cc:482
+#: konq_popupmenu.cc:512
msgid "Open the document in a new window"
msgstr "在新窗口中打开文档"
-#: konq_popupmenu.cc:501
+#: konq_popupmenu.cc:531
msgid "Create &Folder..."
msgstr "创建文件夹(&F)..."
-#: konq_popupmenu.cc:508
+#: konq_popupmenu.cc:538
msgid "&Restore"
msgstr "恢复(&R)"
-#: konq_popupmenu.cc:579
+#: konq_popupmenu.cc:609
msgid "&Empty Trash Bin"
msgstr "清空回收站(&E)"
-#: konq_popupmenu.cc:601
+#: konq_popupmenu.cc:631
msgid "&Bookmark This Page"
msgstr "将此页加入书签(&B)"
-#: konq_popupmenu.cc:603
+#: konq_popupmenu.cc:633
msgid "&Bookmark This Location"
msgstr "将此位置加入书签(&B)"
-#: konq_popupmenu.cc:606
+#: konq_popupmenu.cc:636
msgid "&Bookmark This Folder"
msgstr "将此文件夹加入书签(&B)"
-#: konq_popupmenu.cc:608
+#: konq_popupmenu.cc:638
msgid "&Bookmark This Link"
msgstr "将此链接加入书签(&B)"
-#: konq_popupmenu.cc:610
+#: konq_popupmenu.cc:640
msgid "&Bookmark This File"
msgstr "将此文件加入书签(&B)"
-#: konq_popupmenu.cc:858
+#: konq_popupmenu.cc:894
msgid "&Open With"
msgstr "打开方式(&O)"
-#: konq_popupmenu.cc:888
+#: konq_popupmenu.cc:924
#, c-format
msgid "Open with %1"
msgstr "用 %1 打开"
-#: konq_popupmenu.cc:902
+#: konq_popupmenu.cc:938
msgid "&Other..."
msgstr "其它(&O)..."
-#: konq_popupmenu.cc:906 konq_popupmenu.cc:913
+#: konq_popupmenu.cc:942 konq_popupmenu.cc:949
msgid "&Open With..."
msgstr "打开方式(&O)..."
-#: konq_popupmenu.cc:933
+#: konq_popupmenu.cc:969
msgid "Ac&tions"
msgstr "动作(&T)"
-#: konq_popupmenu.cc:967
+#: konq_popupmenu.cc:1003
msgid "&Properties"
msgstr "属性(&P)"
-#: konq_popupmenu.cc:981
+#: konq_popupmenu.cc:1017
msgid "Share"
msgstr "共享"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
index 19eba7433c3..e938cf84a2f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libtaskbar\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-10-15 20:57+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -17,241 +18,315 @@ msgstr ""
#. i18n: file taskbar.kcfg line 11
#: rc.cpp:3
#, no-c-format
-msgid "Show windows from all desktops"
-msgstr "显示全部桌面中的窗口"
+msgid "Use the global taskbar configuration"
+msgstr ""
#. i18n: file taskbar.kcfg line 12
#: rc.cpp:6
#, no-c-format
msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"the windows on the current desktop. \\n\\nBy default, this option is selected "
-"and all windows are shown."
+"Turning this option off will cause the taskbar to ignore the global taskbar "
+"configuration, instead using a specific configuration for that particular "
+"taskbar."
msgstr ""
-"关闭此选项将使得任务栏<b>只</b>显示当前桌面中的窗口。\\n\\n默认情况下,此选项是选中的,将会显示所有窗口。"
#. i18n: file taskbar.kcfg line 16
#: rc.cpp:9
#, no-c-format
-msgid "Show only minimized windows"
-msgstr "只显示最小化的窗口"
+msgid "Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
#. i18n: file taskbar.kcfg line 17
#: rc.cpp:12
+#, fuzzy, no-c-format
+msgid ""
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
+msgstr "开启此选项将允许您为任务按钮文本和背景选择您自己的颜色。"
+
+#. i18n: file taskbar.kcfg line 21
+#: rc.cpp:15
#, no-c-format
+msgid "Show windows from all desktops"
+msgstr "显示全部桌面中的窗口"
+
+#. i18n: file taskbar.kcfg line 22
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"the windows on the current desktop. By default, this option is selected and all "
+"windows are shown."
+msgstr ""
+"关闭此选项将使得任务栏<b>只</b>显示当前桌面中的窗口。\\n\\n默认情况下,此选项是选中的,将会显示所有窗口。"
+
+#. i18n: file taskbar.kcfg line 26
+#: rc.cpp:21
+#, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 27
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid ""
+"Enabling this option causes the taskbar to cycle through the current list of "
+"windows when using the mouse wheel"
+msgstr "选择此选项将使得任务栏显示这样一个按钮,单击该按钮时将在弹出菜单中显示所有窗口的列表。"
+
+#. i18n: file taskbar.kcfg line 31
+#: rc.cpp:27
+#, no-c-format
+msgid "Show only minimized windows"
+msgstr "只显示最小化的窗口"
+
+#. i18n: file taskbar.kcfg line 32
+#: rc.cpp:30
+#, fuzzy, no-c-format
msgid ""
"Select this option if you want the taskbar to display <b>only</b> "
-"minimized windows. \\n\\nBy default, this option is not selected and the "
-"taskbar will show all windows."
+"minimized windows. By default, this option is not selected and the taskbar will "
+"show all windows."
msgstr ""
"如果您想要任务栏<b>只</b>显示最小化了的窗口,请选择此选项。\\n\\n默认情况下,此选项是未选中的,任务栏将显示全部窗口。"
-#. i18n: file taskbar.kcfg line 22
-#: rc.cpp:15
+#. i18n: file taskbar.kcfg line 37
+#: rc.cpp:33 rc.cpp:48
#, no-c-format
msgid "Never"
msgstr "从不"
-#. i18n: file taskbar.kcfg line 25
-#: rc.cpp:18
+#. i18n: file taskbar.kcfg line 40
+#: rc.cpp:36 rc.cpp:51
#, no-c-format
msgid "When Taskbar Full"
msgstr "当任务栏占满时"
-#. i18n: file taskbar.kcfg line 28
-#: rc.cpp:21
+#. i18n: file taskbar.kcfg line 43
+#: rc.cpp:39 rc.cpp:54
#, no-c-format
msgid "Always"
msgstr "总是"
-#. i18n: file taskbar.kcfg line 32
-#: rc.cpp:24
+#. i18n: file taskbar.kcfg line 47
+#: rc.cpp:42
+#, no-c-format
+msgid "Display:"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 48
+#: rc.cpp:45
+#, no-c-format
+msgid ""
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 63
+#: rc.cpp:57
#, no-c-format
msgid "Group similar tasks:"
msgstr "分组类似任务:"
-#. i18n: file taskbar.kcfg line 33
-#: rc.cpp:27
-#, no-c-format
+#. i18n: file taskbar.kcfg line 64
+#: rc.cpp:60
+#, fuzzy, no-c-format
msgid ""
"The taskbar can group similar windows into single buttons. When one of these "
"window group buttons are clicked on a menu appears showing all the windows in "
"that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\\n\\nYou can set the taskbar to <strong>Never</strong> "
+"option. You can set the taskbar to <strong>Never</strong> "
"group windows, to <strong>Always</strong> group windows or to group windows "
-"only <strong>When the Taskbar is Full</strong>.\\n\\nBy default the taskbar "
-"groups windows when it is full."
+"only <strong>When the Taskbar is Full</strong>. By default the taskbar groups "
+"windows when it is full."
msgstr ""
"任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后,会出现一个菜单,其中显示了该组中的全部窗口。<em>显示全部窗口</em>"
"选项可能会非常有用。\\n\\n您可以将任务栏设置为<strong>从不</strong>分组窗口,<strong>总是</strong>"
"分组窗口,或者是仅当<strong>任务栏满时</strong>。\\n\\n默认情况下,系统会在任务栏满时对窗口进行分组。"
-#. i18n: file taskbar.kcfg line 37
-#: rc.cpp:30
+#. i18n: file taskbar.kcfg line 69
+#: rc.cpp:63
+#, no-c-format
+msgid "Any"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 72
+#: rc.cpp:66
+#, no-c-format
+msgid "Only Stopped"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 75
+#: rc.cpp:69
+#, no-c-format
+msgid "Only Running"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 79
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "Show tasks with state:"
+msgstr "显示任务列表"
+
+#. i18n: file taskbar.kcfg line 80
+#: rc.cpp:75
+#, no-c-format
+msgid ""
+"The taskbar can show and/or hide tasks based on their current process state. "
+"Select <em>Any</em> to show all tasks regardless of current state."
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 84
+#: rc.cpp:78
#, no-c-format
msgid "Sort windows by desktop"
msgstr "按桌面排序窗口"
-#. i18n: file taskbar.kcfg line 38
-#: rc.cpp:33
-#, no-c-format
+#. i18n: file taskbar.kcfg line 85
+#: rc.cpp:81
+#, fuzzy, no-c-format
msgid ""
"Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\\n\\nBy default this option is selected."
+"desktop they appear on. By default this option is selected."
msgstr ""
"选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\\n\\n默认情况下,此选项是选中的。"
-#. i18n: file taskbar.kcfg line 42
-#: rc.cpp:36
+#. i18n: file taskbar.kcfg line 89
+#: rc.cpp:84
#, no-c-format
msgid "Sort windows by application"
msgstr "按应用程序排序窗口"
-#. i18n: file taskbar.kcfg line 43
-#: rc.cpp:39
-#, no-c-format
+#. i18n: file taskbar.kcfg line 90
+#: rc.cpp:87
+#, fuzzy, no-c-format
msgid ""
"Selecting this option causes the taskbar to show windows ordered by "
-"application.\\n\\nBy default this option is selected."
+"application. By default this option is selected."
msgstr ""
"选择此选项将使得任务栏按照应用程序的顺序显示窗口。\\n\\n默认情况下,此选项是选中的。"
-#. i18n: file taskbar.kcfg line 47
-#: rc.cpp:42
-#, no-c-format
-msgid "Show application icons"
-msgstr "显示应用程序图标"
-
-#. i18n: file taskbar.kcfg line 48
-#: rc.cpp:45
-#, no-c-format
-msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\\n\\nBy default this option is selected."
-msgstr ""
-"如果您想要在任务栏中同时显示窗口图标及其标题,请选择此选项。\\n\\n默认情况下,此选项是选中的。"
-
-#. i18n: file taskbar.kcfg line 64
-#: rc.cpp:48
+#. i18n: file taskbar.kcfg line 106
+#: rc.cpp:90
#, no-c-format
msgid "Show windows from all screens"
msgstr "显示全部屏幕中的窗口"
-#. i18n: file taskbar.kcfg line 65
-#: rc.cpp:51
-#, no-c-format
+#. i18n: file taskbar.kcfg line 107
+#: rc.cpp:93
+#, fuzzy, no-c-format
msgid ""
"Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\\n\\nBy default, "
-"this option is selected and all windows are shown."
+"windows which are on the same Xinerama screen as the taskbar. By default, this "
+"option is selected and all windows are shown."
msgstr ""
"关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\\n\\n默认情况下,此选项为选中状态,即会显示全部窗口。"
-#. i18n: file taskbar.kcfg line 74
-#: rc.cpp:54
+#. i18n: file taskbar.kcfg line 116
+#: rc.cpp:96
#, no-c-format
msgid "Show window list button"
msgstr "显示窗口列表"
-#. i18n: file taskbar.kcfg line 75
-#: rc.cpp:57
+#. i18n: file taskbar.kcfg line 117
+#: rc.cpp:99
#, no-c-format
msgid ""
"Selecting this option causes the taskbar to display a button that, when "
"clicked, shows a list of all windows in a popup menu."
msgstr "选择此选项将使得任务栏显示这样一个按钮,单击该按钮时将在弹出菜单中显示所有窗口的列表。"
-#. i18n: file taskbar.kcfg line 87
-#: rc.cpp:60
+#. i18n: file taskbar.kcfg line 129
+#: rc.cpp:102
#, no-c-format
msgid "Show Task List"
msgstr "显示任务列表"
-#. i18n: file taskbar.kcfg line 90
-#: rc.cpp:63
+#. i18n: file taskbar.kcfg line 132
+#: rc.cpp:105
#, no-c-format
msgid "Show Operations Menu"
msgstr "显示操作菜单"
-#. i18n: file taskbar.kcfg line 93
-#: rc.cpp:66
+#. i18n: file taskbar.kcfg line 135
+#: rc.cpp:108
#, no-c-format
msgid "Activate, Raise or Minimize Task"
msgstr "激活、升起或最小化任务"
-#. i18n: file taskbar.kcfg line 96
-#: rc.cpp:69
+#. i18n: file taskbar.kcfg line 138
+#: rc.cpp:111
#, no-c-format
msgid "Activate Task"
msgstr "激活任务"
-#. i18n: file taskbar.kcfg line 99
-#: rc.cpp:72
+#. i18n: file taskbar.kcfg line 141
+#: rc.cpp:114
#, no-c-format
msgid "Raise Task"
msgstr "提升任务"
-#. i18n: file taskbar.kcfg line 102
-#: rc.cpp:75
+#. i18n: file taskbar.kcfg line 144
+#: rc.cpp:117
#, no-c-format
msgid "Lower Task"
msgstr "降低任务"
-#. i18n: file taskbar.kcfg line 105
-#: rc.cpp:78
+#. i18n: file taskbar.kcfg line 147
+#: rc.cpp:120
#, no-c-format
msgid "Minimize Task"
msgstr "最小化任务"
-#. i18n: file taskbar.kcfg line 108
-#: rc.cpp:81
+#. i18n: file taskbar.kcfg line 150
+#: rc.cpp:123
#, no-c-format
msgid "Move To Current Desktop"
msgstr "移动到当前桌面"
-#. i18n: file taskbar.kcfg line 111
-#: rc.cpp:84
+#. i18n: file taskbar.kcfg line 153
+#: rc.cpp:126
#, no-c-format
msgid "Close Task"
msgstr "关闭任务"
-#. i18n: file taskbar.kcfg line 117
-#: rc.cpp:87
+#. i18n: file taskbar.kcfg line 159
+#: rc.cpp:129
#, no-c-format
msgid "Mouse button actions"
msgstr "鼠标按钮动作"
-#. i18n: file taskbar.kcfg line 125
-#: rc.cpp:90
+#. i18n: file taskbar.kcfg line 167
+#: rc.cpp:132
#, no-c-format
msgid ""
"The number of times to blink a taskbar button when a window asks for attention. "
"Setting this to 1000 or greater causes the button to blink forever."
msgstr "当窗口请求注意时任务栏按钮应闪烁的次数。将此值设定为 1000 或更高将使得任务按钮永远闪烁。"
-#. i18n: file taskbar.kcfg line 130
-#: rc.cpp:93
+#. i18n: file taskbar.kcfg line 172
+#: rc.cpp:135
#, no-c-format
msgid "Draw taskbar entries \"flat\" and not as a button"
msgstr "平面绘制任务栏项,不绘制为按钮"
-#. i18n: file taskbar.kcfg line 131
-#: rc.cpp:96
-#, no-c-format
+#. i18n: file taskbar.kcfg line 173
+#: rc.cpp:138
+#, fuzzy, no-c-format
msgid ""
"Turning this option on will cause the taskbar to draw visible button frames for "
-"each entry in the taskbar. \\n\\nBy default, this option is off."
+"each entry in the taskbar. By default, this option is off."
msgstr ""
"开启此选项将是的任务栏中的每一项周围绘制可见边框。\\n\\n默认情况下,此选项是关闭的。"
-#. i18n: file taskbar.kcfg line 135
-#: rc.cpp:99
+#. i18n: file taskbar.kcfg line 177
+#: rc.cpp:141
#, no-c-format
msgid "Draw taskbar text with a halo around it"
msgstr "任务栏文字周围绘制边框"
-#. i18n: file taskbar.kcfg line 136
-#: rc.cpp:102
+#. i18n: file taskbar.kcfg line 178
+#: rc.cpp:144
#, no-c-format
msgid ""
"Turning this option on will cause the taskbar to draw fancier text that has an "
@@ -259,20 +334,20 @@ msgid ""
"dark panel backgrounds, it is slower."
msgstr "打开此选项将使得任务栏绘制周围有边框的文本。尽管此选项对透明面板或特定的暗色面板背景非常有用,但也很慢。"
-#. i18n: file taskbar.kcfg line 140
-#: rc.cpp:105
+#. i18n: file taskbar.kcfg line 182
+#: rc.cpp:147
#, no-c-format
msgid "Show a visible button frame on the task the cursor is positioned over"
msgstr "鼠标指针指向任务时显示可见的按钮边框"
-#. i18n: file taskbar.kcfg line 144
-#: rc.cpp:108
+#. i18n: file taskbar.kcfg line 186
+#: rc.cpp:150
#, no-c-format
msgid "Show thumbnails instead of icons in the mouse-over effects"
msgstr "在鼠标悬停效果中显示缩略图,而非图标"
-#. i18n: file taskbar.kcfg line 145
-#: rc.cpp:111
+#. i18n: file taskbar.kcfg line 187
+#: rc.cpp:153
#, no-c-format
msgid ""
"Enabling this option will draw a thumbnail of the window in its mouse-over "
@@ -284,14 +359,14 @@ msgstr ""
"启用此选项将在鼠标指针指向任务时绘制窗口缩略图。"
"<p>如果窗口已经最小化,或者位于不同的桌面上,则会显示图标,除非该窗口被恢复,或者激活了相应的桌面。</p>"
-#. i18n: file taskbar.kcfg line 149
-#: rc.cpp:114
+#. i18n: file taskbar.kcfg line 191
+#: rc.cpp:156
#, no-c-format
msgid "Maximum width/height of the thumbnail in pixels"
msgstr "缩略图的最大宽度/高度(以像素计)"
-#. i18n: file taskbar.kcfg line 150
-#: rc.cpp:117
+#. i18n: file taskbar.kcfg line 192
+#: rc.cpp:159
#, no-c-format
msgid ""
"A thumbnail is created by resizing the window. The scaling factor is determined "
@@ -299,56 +374,56 @@ msgid ""
"not exceed this value in any dimension."
msgstr "通过缩放窗口来创建缩略图。缩放因子取决于窗口的最大尺寸及此值。这样的话,缩略图的大小就不会在任何一个方向上超过此值。"
-#. i18n: file taskbar.kcfg line 154
-#: rc.cpp:120
+#. i18n: file taskbar.kcfg line 196
+#: rc.cpp:162
#, no-c-format
msgid "Use custom colors for taskbar buttons text and background"
msgstr "为任务栏按钮文本和背景使用自定义颜色"
-#. i18n: file taskbar.kcfg line 155
-#: rc.cpp:123
+#. i18n: file taskbar.kcfg line 197
+#: rc.cpp:165
#, no-c-format
msgid ""
"Turning this option on will allow choosing your own colors for taskbar buttons "
"text and background."
msgstr "开启此选项将允许您为任务按钮文本和背景选择您自己的颜色。"
-#. i18n: file taskbar.kcfg line 158
-#: rc.cpp:126
+#. i18n: file taskbar.kcfg line 200
+#: rc.cpp:168
#, no-c-format
msgid "Color to use for active task button text"
msgstr "活动任务的按钮文本所使用的颜色"
-#. i18n: file taskbar.kcfg line 160
-#: rc.cpp:129
+#. i18n: file taskbar.kcfg line 202
+#: rc.cpp:171
#, no-c-format
msgid ""
"This color is used for displaying text on taskbar button for task which is "
"active at the moment."
msgstr "此颜色将用于显示活动任务的任务栏按钮上的文本"
-#. i18n: file taskbar.kcfg line 163
-#: rc.cpp:132
+#. i18n: file taskbar.kcfg line 205
+#: rc.cpp:174
#, no-c-format
msgid "Color to use for inactive tasks button text"
msgstr "非活动任务的按钮文本所使用的颜色"
-#. i18n: file taskbar.kcfg line 165
-#: rc.cpp:135
+#. i18n: file taskbar.kcfg line 207
+#: rc.cpp:177
#, no-c-format
msgid ""
"This color is used for displaying text on taskbar button for tasks other than "
"active."
msgstr "此颜色将用于显示非活动任务的任务栏按钮上的文本"
-#. i18n: file taskbar.kcfg line 168
-#: rc.cpp:138
+#. i18n: file taskbar.kcfg line 210
+#: rc.cpp:180
#, no-c-format
msgid "Color to use for taskbar buttons background"
msgstr "任务栏按钮背景所使用的颜色"
-#. i18n: file taskbar.kcfg line 170
-#: rc.cpp:141
+#. i18n: file taskbar.kcfg line 212
+#: rc.cpp:183
#, no-c-format
msgid "This color is used for displaying background of taskbar buttons."
msgstr "此颜色将用于显示任务栏按钮背景。"
@@ -361,27 +436,49 @@ msgstr "下个任务栏项"
msgid "Previous Taskbar Entry"
msgstr "上个任务栏项"
-#: taskcontainer.cpp:623 taskcontainer.cpp:1600
+#: taskcontainer.cpp:728 taskcontainer.cpp:1840
msgid "modified"
msgstr "已修改"
-#: taskcontainer.cpp:1517
+#: taskcontainer.cpp:1281
+msgid "Move to Beginning"
+msgstr ""
+
+#: taskcontainer.cpp:1286
+msgid "Move Left"
+msgstr ""
+
+#: taskcontainer.cpp:1291
+msgid "Move Right"
+msgstr ""
+
+#: taskcontainer.cpp:1296
+msgid "Move to End"
+msgstr ""
+
+#: taskcontainer.cpp:1754
msgid "Loading application ..."
msgstr "正在装入应用程序..."
-#: taskcontainer.cpp:1581
+#: taskcontainer.cpp:1821
msgid "On all desktops"
msgstr "位于全部桌面"
-#: taskcontainer.cpp:1586
+#: taskcontainer.cpp:1826
#, c-format
msgid "On %1"
msgstr "位于%1"
-#: taskcontainer.cpp:1592
+#: taskcontainer.cpp:1832
msgid "Requesting attention"
msgstr "请求注意"
-#: taskcontainer.cpp:1598
+#: taskcontainer.cpp:1838
msgid "Has unsaved changes"
msgstr "有未保存的更改"
+
+#~ msgid "Show application icons"
+#~ msgstr "显示应用程序图标"
+
+#~ msgid "Select this option if you want window icons to appear along with their titles in the taskbar.\\n\\nBy default this option is selected."
+#~ msgstr "如果您想要在任务栏中同时显示窗口图标及其标题,请选择此选项。\\n\\n默认情况下,此选项是选中的。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po b/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
index 7c4231b85a9..a317eecabae 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: libtaskmanager\n"
-"POT-Creation-Date: 2007-08-31 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-06-11 13:57+0800\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -17,75 +18,79 @@ msgstr ""
msgid "modified"
msgstr "已修改"
-#: taskrmbmenu.cpp:69
+#: taskrmbmenu.cpp:71
msgid "Ad&vanced"
msgstr "高级(&V)"
-#: taskrmbmenu.cpp:74
+#: taskrmbmenu.cpp:76
msgid "To &Desktop"
msgstr "放到桌面(&D)"
-#: taskrmbmenu.cpp:78
+#: taskrmbmenu.cpp:80
msgid "&To Current Desktop"
msgstr "放到当前桌面(&T)"
-#: taskrmbmenu.cpp:89
+#: taskrmbmenu.cpp:91
msgid "&Move"
msgstr "移动(&M)"
-#: taskrmbmenu.cpp:92
+#: taskrmbmenu.cpp:94
msgid "Re&size"
msgstr "大小(&S)"
-#: taskrmbmenu.cpp:95
+#: taskrmbmenu.cpp:97
msgid "Mi&nimize"
msgstr "最小化(&N)"
-#: taskrmbmenu.cpp:99
+#: taskrmbmenu.cpp:101
msgid "Ma&ximize"
msgstr "最大化(&X)"
-#: taskrmbmenu.cpp:103
+#: taskrmbmenu.cpp:105
msgid "&Shade"
msgstr "卷起(&S)"
-#: taskrmbmenu.cpp:136
+#: taskrmbmenu.cpp:113
+msgid "Move Task Button"
+msgstr ""
+
+#: taskrmbmenu.cpp:145
msgid "All to &Desktop"
msgstr "全部放到桌面(&D)"
-#: taskrmbmenu.cpp:138
+#: taskrmbmenu.cpp:147
msgid "All &to Current Desktop"
msgstr "全部放到当前桌面(&T)"
-#: taskrmbmenu.cpp:153
+#: taskrmbmenu.cpp:162
msgid "Mi&nimize All"
msgstr "全部最小化(&N)"
-#: taskrmbmenu.cpp:166
+#: taskrmbmenu.cpp:175
msgid "Ma&ximize All"
msgstr "全部最大化(&X)"
-#: taskrmbmenu.cpp:179
+#: taskrmbmenu.cpp:188
msgid "&Restore All"
msgstr "全部恢复(&R)"
-#: taskrmbmenu.cpp:194
+#: taskrmbmenu.cpp:203
msgid "&Close All"
msgstr "全部关闭(&C)"
-#: taskrmbmenu.cpp:205
+#: taskrmbmenu.cpp:214
msgid "Keep &Above Others"
msgstr "常居顶端(&A)"
-#: taskrmbmenu.cpp:210
+#: taskrmbmenu.cpp:219
msgid "Keep &Below Others"
msgstr "常居底端(&B)"
-#: taskrmbmenu.cpp:215
+#: taskrmbmenu.cpp:224
msgid "&Fullscreen"
msgstr "全屏(&F)"
-#: taskrmbmenu.cpp:232 taskrmbmenu.cpp:253
+#: taskrmbmenu.cpp:241 taskrmbmenu.cpp:262
msgid "&All Desktops"
msgstr "全部桌面(&A)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/lockout.po b/tde-i18n-zh_CN/messages/tdebase/lockout.po
index 94d7f0fd149..6fff7ba4188 100644
--- a/tde-i18n-zh_CN/messages/tdebase/lockout.po
+++ b/tde-i18n-zh_CN/messages/tdebase/lockout.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: lockout\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-19 01:44+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po b/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
index 866767b5914..d2c080026fd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: mediaapplet\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po b/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
index be1d146c863..fd6ffc01280 100644
--- a/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: naughtyapplet\n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-09-10 15:09+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/nsplugin.po b/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
index 0d7b5e438b1..665e71608a5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-12-22 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-21 22:22+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -48,42 +49,42 @@ msgstr "正在为 %1 载入 Netscape 插件"
msgid "Unable to load Netscape plugin for %1"
msgstr "无法为 %1 载入 Netscape 插件"
-#: pluginscan.cpp:200
+#: pluginscan.cpp:201
msgid "Netscape plugin mimeinfo"
msgstr "Netscape 插件 mime 信息"
-#: pluginscan.cpp:235
+#: pluginscan.cpp:241
msgid "Unnamed plugin"
msgstr "无命名插件"
-#: pluginscan.cpp:461 pluginscan.cpp:464
+#: pluginscan.cpp:468 pluginscan.cpp:471
msgid "Netscape plugin viewer"
msgstr "Netscape 插件查看器"
-#: pluginscan.cpp:514
+#: pluginscan.cpp:521
msgid "Show progress output for GUI"
msgstr "显示 GUI 的进度输出"
-#: pluginscan.cpp:521
+#: pluginscan.cpp:528
msgid "nspluginscan"
msgstr "nspluginscan"
-#: viewer/nsplugin.cpp:819
+#: viewer/nsplugin.cpp:818
#, c-format
msgid "Submitting data to %1"
msgstr "正在将数据提交到 %1"
-#: viewer/nsplugin.cpp:838
+#: viewer/nsplugin.cpp:837
#, c-format
msgid "Requesting %1"
msgstr "正在请求 %1"
-#: viewer/viewer.cpp:280
+#: viewer/viewer.cpp:257
msgid ""
"There was an error connecting to the Desktop communications server. Please make "
"sure that the 'dcopserver' process has been started, and then try again."
msgstr "连接到桌面通信服务器时发生错误。请确定“dcopserver”进程已经启动,然后重试。"
-#: viewer/viewer.cpp:284
+#: viewer/viewer.cpp:261
msgid "Error Connecting to DCOP Server"
msgstr "连接到 DCOP 服务器时发生错误"
diff --git a/tde-i18n-zh_CN/messages/tdebase/privacy.po b/tde-i18n-zh_CN/messages/tdebase/privacy.po
index a805d6fa0f4..89172004d77 100644
--- a/tde-i18n-zh_CN/messages/tdebase/privacy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/privacy.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: privacy\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-01 17:04+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -78,8 +79,8 @@ msgid "Saved Clipboard Contents"
msgstr "已存的剪切板内容"
#: privacy.cpp:100
-msgid "Web History"
-msgstr "Web 历史"
+msgid "Web and File Manager History"
+msgstr ""
#: privacy.cpp:102
msgid "Web Cache"
@@ -102,75 +103,85 @@ msgid "Favorite Icons"
msgstr "收藏图标"
#: privacy.cpp:112
+msgid "KPDF Document Data"
+msgstr ""
+
+#: privacy.cpp:114
msgid ""
"Check all cleanup actions you would like to perform. These will be executed by "
"pressing the button below"
msgstr "确认您将执行所有的清除动作。按下面的按钮开始执行"
-#: privacy.cpp:113
+#: privacy.cpp:115
msgid "Immediately performs the cleanup actions selected above"
msgstr "立即执行上面选中的清除动作"
-#: privacy.cpp:115
+#: privacy.cpp:117
msgid "Clears all cached thumbnails"
msgstr "清楚缓存的全部缩略图"
-#: privacy.cpp:116
+#: privacy.cpp:118
msgid ""
"Clears the history of commands run through the Run Command tool on the desktop"
msgstr "清除通过桌面的运行命令工具运行的命令记录"
-#: privacy.cpp:117
+#: privacy.cpp:119
msgid "Clears all stored cookies set by websites"
msgstr "清除所有网站存储的 cookies"
-#: privacy.cpp:118
-msgid "Clears the history of visited websites"
+#: privacy.cpp:120
+#, fuzzy
+msgid "Clears the history of visited websites and file manager URLs"
msgstr "清除已访问网站的历史记录"
-#: privacy.cpp:119
+#: privacy.cpp:121
msgid "Clears the clipboard contents stored by Klipper"
msgstr "清除 Klipper 存储的剪切板内容"
-#: privacy.cpp:120
+#: privacy.cpp:122
msgid "Clears the temporary cache of websites visited"
msgstr "清除已访问网站的缓存"
-#: privacy.cpp:121
+#: privacy.cpp:123
msgid "Clears values which were entered into forms on websites"
msgstr "清除网站表单上已输入的值"
-#: privacy.cpp:122
+#: privacy.cpp:124
msgid ""
"Clears the list of recently used documents from the TDE applications menu"
msgstr "从 TDE 应用程序菜单中清除最近使用文档的列表"
-#: privacy.cpp:123
+#: privacy.cpp:125
msgid "Clears the entries from the list of recently started applications"
msgstr "清除最近启动的应用程序列表"
-#: privacy.cpp:124
+#: privacy.cpp:126
msgid "Clears the FavIcons cached from visited websites"
msgstr "清除已访问网站的个人图标缓存"
-#: privacy.cpp:251
+#: privacy.cpp:127
+#, fuzzy
+msgid "Clears all KPDF document data files"
+msgstr "清楚缓存的全部缩略图"
+
+#: privacy.cpp:257
msgid ""
"You are deleting data that is potentially valuable to you. Are you sure?"
msgstr "您正在删除对您有用的数据。您确定吗?"
-#: privacy.cpp:254
+#: privacy.cpp:260
msgid "Starting cleanup..."
msgstr "开始清除..."
-#: privacy.cpp:263
+#: privacy.cpp:269
msgid "Clearing %1..."
msgstr "正在清除%1..."
-#: privacy.cpp:298
+#: privacy.cpp:307
msgid "Clearing of %1 failed"
msgstr "清除%1失败"
-#: privacy.cpp:305
+#: privacy.cpp:314
msgid "Clean up finished."
msgstr "整理完成。"
@@ -345,3 +356,6 @@ msgstr "通过电子邮件"
#, no-c-format
msgid "And do not allow me to remove my contact information"
msgstr "并且不允许我移除我的联系信息"
+
+#~ msgid "Web History"
+#~ msgstr "Web 历史"
diff --git a/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po b/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
index 5ce08f9dc7e..62691ece655 100644
--- a/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
+++ b/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 07:43+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,19 @@ msgstr "i18n-translation@lists.linux.net.cn"
msgid "Automatic"
msgstr "自动"
-#: quickbutton.cpp:148 quicklauncher.cpp:165 quicklauncher.cpp:169
+#: quickbutton.cpp:63 quickbutton.cpp:64
+msgid "Show Desktop"
+msgstr ""
+
+#: quickbutton.cpp:171 quicklauncher.cpp:165 quicklauncher.cpp:169
msgid "Add Application"
msgstr "添加应用程序"
-#: quickbutton.cpp:154
+#: quickbutton.cpp:174 quicklauncher.cpp:175
+msgid "Remove Application"
+msgstr "删除应用程序"
+
+#: quickbutton.cpp:177
msgid "Never Remove Automatically"
msgstr "从不自动删除"
@@ -42,19 +51,15 @@ msgstr "从不自动删除"
msgid "Configure Quicklauncher..."
msgstr "配置快速启动..."
-#: quicklauncher.cpp:175
-msgid "Remove Application"
-msgstr "删除应用程序"
-
#: quicklauncher.cpp:198
msgid "Unknown"
msgstr "未知"
-#: quicklauncher.cpp:495
+#: quicklauncher.cpp:499
msgid "Quick Launcher"
msgstr "快速启动"
-#: quicklauncher.cpp:496
+#: quicklauncher.cpp:500
msgid "A simple application launcher"
msgstr "简单的程序启动器"
@@ -67,179 +72,191 @@ msgstr "允许拖放"
#. i18n: file configdlgbase.ui line 35
#: rc.cpp:6
#, no-c-format
+msgid "Enable 'Show Desktop' button"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 43
+#: rc.cpp:9
+#, no-c-format
msgid "Layout"
msgstr "布局"
-#. i18n: file configdlgbase.ui line 46
-#: rc.cpp:9
+#. i18n: file configdlgbase.ui line 54
+#: rc.cpp:12
#, no-c-format
msgid "Conserve space"
msgstr "留存空间"
-#. i18n: file configdlgbase.ui line 49
-#: rc.cpp:12
+#. i18n: file configdlgbase.ui line 57
+#: rc.cpp:15
#, no-c-format
msgid "Do not expand icons to the size of the panel"
msgstr "不将图标展开为面板大小"
-#. i18n: file configdlgbase.ui line 57
-#: rc.cpp:15
+#. i18n: file configdlgbase.ui line 65
+#: rc.cpp:18
#, no-c-format
msgid "Icon size:"
msgstr "图标大小:"
-#. i18n: file configdlgbase.ui line 92
-#: rc.cpp:18
+#. i18n: file configdlgbase.ui line 100
+#: rc.cpp:21
#, no-c-format
msgid "Most Popular Applications"
msgstr "最流行的应用程序"
-#. i18n: file configdlgbase.ui line 145
-#: rc.cpp:21
+#. i18n: file configdlgbase.ui line 153
+#: rc.cpp:24
#, no-c-format
msgid "Short Term"
msgstr "短期"
-#. i18n: file configdlgbase.ui line 156
-#: rc.cpp:24
+#. i18n: file configdlgbase.ui line 164
+#: rc.cpp:27
#, no-c-format
msgid "Long Term"
msgstr "长期"
-#. i18n: file configdlgbase.ui line 169
-#: rc.cpp:27
+#. i18n: file configdlgbase.ui line 177
+#: rc.cpp:30
#, no-c-format
msgid "Maximum number of applications:"
msgstr "应用程序的最大数量:"
-#. i18n: file configdlgbase.ui line 204
-#: rc.cpp:30
+#. i18n: file configdlgbase.ui line 212
+#: rc.cpp:33
#, no-c-format
msgid "Minimum number of applications:"
msgstr "应用程序的最小数量:"
-#. i18n: file configdlgbase.ui line 212
-#: rc.cpp:33
+#. i18n: file configdlgbase.ui line 220
+#: rc.cpp:36
#, no-c-format
msgid "Add/remove applications based on their popularity"
msgstr "根据应用程序的流行性添加/删除"
#. i18n: file launcherapplet.kcfg line 9
-#: rc.cpp:36
+#: rc.cpp:39
#, no-c-format
msgid "Conserve Space"
msgstr "留存空间"
#. i18n: file launcherapplet.kcfg line 13
-#: rc.cpp:39
+#: rc.cpp:42
#, no-c-format
msgid "Drag Enabled"
msgstr "启用拖曳"
#. i18n: file launcherapplet.kcfg line 17
-#: rc.cpp:42
+#: rc.cpp:45
+#, no-c-format
+msgid "Show Desktop Button Enabled"
+msgstr ""
+
+#. i18n: file launcherapplet.kcfg line 21
+#: rc.cpp:48
#, no-c-format
msgid "Icon Size"
msgstr "图标大小"
-#. i18n: file launcherapplet.kcfg line 21
-#: rc.cpp:45
+#. i18n: file launcherapplet.kcfg line 25
+#: rc.cpp:51
#, no-c-format
msgid "Offered Icon Sizes"
msgstr "提供的图标大小"
-#. i18n: file launcherapplet.kcfg line 25
-#: rc.cpp:48
+#. i18n: file launcherapplet.kcfg line 29
+#: rc.cpp:54
#, no-c-format
msgid "Buttons"
msgstr "按钮"
-#. i18n: file launcherapplet.kcfg line 29
-#: rc.cpp:51
+#. i18n: file launcherapplet.kcfg line 33
+#: rc.cpp:57
#, no-c-format
msgid "Volatile Buttons"
msgstr "易变按钮"
-#. i18n: file launcherapplet.kcfg line 30
-#: rc.cpp:54
+#. i18n: file launcherapplet.kcfg line 34
+#: rc.cpp:60
#, no-c-format
msgid "Buttons that can be removed dynamically if they become unpopular"
msgstr "应用程序不再流行时按钮将被删除"
-#. i18n: file launcherapplet.kcfg line 34
-#: rc.cpp:57
+#. i18n: file launcherapplet.kcfg line 38
+#: rc.cpp:63
#, no-c-format
msgid "Show frame for volatile buttons"
msgstr "显示易变按钮的框架"
-#. i18n: file launcherapplet.kcfg line 38
-#: rc.cpp:60
+#. i18n: file launcherapplet.kcfg line 42
+#: rc.cpp:66
#, no-c-format
msgid "Auto Adjust Enabled"
msgstr "自动调整已启用"
-#. i18n: file launcherapplet.kcfg line 42
-#: rc.cpp:63
+#. i18n: file launcherapplet.kcfg line 46
+#: rc.cpp:69
#, no-c-format
msgid "Minimum Number of Items"
msgstr "最少项数"
-#. i18n: file launcherapplet.kcfg line 47
-#: rc.cpp:66
+#. i18n: file launcherapplet.kcfg line 51
+#: rc.cpp:72
#, no-c-format
msgid "Maximum Number of Items"
msgstr "最多项数"
-#. i18n: file launcherapplet.kcfg line 52
-#: rc.cpp:69
+#. i18n: file launcherapplet.kcfg line 56
+#: rc.cpp:75
#, no-c-format
msgid "History Weight"
msgstr "历史权重"
-#. i18n: file launcherapplet.kcfg line 60
-#: rc.cpp:72
+#. i18n: file launcherapplet.kcfg line 64
+#: rc.cpp:78
#, no-c-format
msgid "Service Cache Size"
msgstr "服务缓存大小"
-#. i18n: file launcherapplet.kcfg line 61
-#: rc.cpp:75
+#. i18n: file launcherapplet.kcfg line 65
+#: rc.cpp:81
#, no-c-format
msgid "Number of services to remember"
msgstr "要记住的服务数"
-#. i18n: file launcherapplet.kcfg line 65
-#: rc.cpp:78
+#. i18n: file launcherapplet.kcfg line 69
+#: rc.cpp:84
#, no-c-format
msgid "Service Names"
msgstr "服务名称"
-#. i18n: file launcherapplet.kcfg line 66
-#: rc.cpp:81
+#. i18n: file launcherapplet.kcfg line 70
+#: rc.cpp:87
#, no-c-format
msgid "Name of known services"
msgstr "已知服务名称"
-#. i18n: file launcherapplet.kcfg line 69
-#: rc.cpp:84
+#. i18n: file launcherapplet.kcfg line 73
+#: rc.cpp:90
#, no-c-format
msgid "Service Insertion Positions"
msgstr "服务插入位置"
-#. i18n: file launcherapplet.kcfg line 70
-#: rc.cpp:87
+#. i18n: file launcherapplet.kcfg line 74
+#: rc.cpp:93
#, no-c-format
msgid "Position where services are inserted when they regain popularity"
msgstr "服务重新流行时插入服务的位置"
-#. i18n: file launcherapplet.kcfg line 73
-#: rc.cpp:90
+#. i18n: file launcherapplet.kcfg line 77
+#: rc.cpp:96
#, no-c-format
msgid "Service History Data"
msgstr "服务历史数据"
-#. i18n: file launcherapplet.kcfg line 74
-#: rc.cpp:93
+#. i18n: file launcherapplet.kcfg line 78
+#: rc.cpp:99
#, no-c-format
msgid "History Data used to determine the popularity of a service"
msgstr "用于确定服务流行程度的历史数据"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po b/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
index 159fd3b0a4f..370340b796e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdedebugdialog\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 10:30+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,26 @@ msgid ""
"Your emails"
msgstr "lark@linux.net.cn"
+#: main.cpp:72
+msgid "Show the fully-fledged dialog instead of the default list dialog"
+msgstr "显示完整的对话框,而不是默认的列表对话框"
+
+#: main.cpp:80
+msgid "TDEDebugDialog"
+msgstr "TDEDebugDialog"
+
+#: main.cpp:81
+msgid "A dialog box for setting preferences for debug output"
+msgstr "用来设置调试输出首选项的对话框"
+
+#: main.cpp:83
+msgid "Maintainer"
+msgstr "维护者"
+
+#: main.cpp:84
+msgid "Original maintainer/developer"
+msgstr ""
+
#: tdedebugdialog.cpp:46 tdelistdebugdialog.cpp:37
msgid "Debug Settings"
msgstr "调试设置"
@@ -75,19 +96,3 @@ msgstr "全选(&S)"
#: tdelistdebugdialog.cpp:57
msgid "&Deselect All"
msgstr "全不选(&D)"
-
-#: main.cpp:72
-msgid "Show the fully-fledged dialog instead of the default list dialog"
-msgstr "显示完整的对话框,而不是默认的列表对话框"
-
-#: main.cpp:80
-msgid "TDEDebugDialog"
-msgstr "TDEDebugDialog"
-
-#: main.cpp:81
-msgid "A dialog box for setting preferences for debug output"
-msgstr "用来设置调试输出首选项的对话框"
-
-#: main.cpp:83
-msgid "Maintainer"
-msgstr "维护者"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po b/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
index 7ac4dc29ae6..d822166f305 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
@@ -5,19 +5,20 @@
msgid ""
msgstr ""
"Project-Id-Version: tdefontinst\n"
-"POT-Creation-Date: 2008-06-16 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-12-21 12:13+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kcmfontinst/KCmFontInst.cpp:87
+#: kcmfontinst/KCmFontInst.cpp:88
msgid "TDE Font Installer"
msgstr "TDE 字体安装程序"
-#: kcmfontinst/KCmFontInst.cpp:90
+#: kcmfontinst/KCmFontInst.cpp:91
msgid ""
"GUI front end to the fonts:/ ioslave.\n"
"(c) Craig Drummond, 2000 - 2004"
@@ -25,34 +26,34 @@ msgstr ""
"fonts:/ ioslave 的图形前端。\n"
"(C) Craig Drummond, 2000 - 2004"
-#: kcmfontinst/KCmFontInst.cpp:92
+#: kcmfontinst/KCmFontInst.cpp:93
msgid "Developer and maintainer"
msgstr "开发者和维护者"
-#: kcmfontinst/KCmFontInst.cpp:157 kcmfontinst/KCmFontInst.cpp:220
+#: kcmfontinst/KCmFontInst.cpp:158 kcmfontinst/KCmFontInst.cpp:221
msgid "Add Fonts..."
msgstr "添加字体..."
-#: kcmfontinst/KCmFontInst.cpp:172
+#: kcmfontinst/KCmFontInst.cpp:173
msgid ""
"<b>The fonts shown are your personal fonts.</b>"
"<br>To see (and install) system-wide fonts, click on the \"Administrator Mode\" "
"button below."
msgstr "<b>显示的是您个人的字体。</b><br>要查看并安装系统级的字体,请单击下面的“管理员模式”按钮。"
-#: kcmfontinst/KCmFontInst.cpp:213
+#: kcmfontinst/KCmFontInst.cpp:214
msgid "Show Bitmap Fonts"
msgstr "显示位图字体"
-#: kcmfontinst/KCmFontInst.cpp:234
+#: kcmfontinst/KCmFontInst.cpp:235
msgid "Configure..."
msgstr "配置..."
-#: kcmfontinst/KCmFontInst.cpp:238
+#: kcmfontinst/KCmFontInst.cpp:239
msgid "Print..."
msgstr "打印..."
-#: kcmfontinst/KCmFontInst.cpp:317
+#: kcmfontinst/KCmFontInst.cpp:318
msgid ""
"<h1>Font Installer</h1>"
"<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -65,7 +66,7 @@ msgstr ""
"<p>您也可以用 Konqueror 来安装字体:在地址栏键入 fonts:/ "
"将会显示您已经安装的字体。要安装字体,只需要简单的把它复制到合适的文件夹里就可以了。"
-#: kcmfontinst/KCmFontInst.cpp:324
+#: kcmfontinst/KCmFontInst.cpp:325
msgid ""
"<h1>Font Installer</h1>"
"<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -85,19 +86,19 @@ msgstr ""
"<p><b>注意:</b>由于您不是以“root”身份登录的,所安装的任何字体都只能由您自己使用。要在整个系统中安装字体,请使用“管理员模式”按钮以“root”"
"身份重新运行此模块。</p>"
-#: kcmfontinst/KCmFontInst.cpp:421
+#: kcmfontinst/KCmFontInst.cpp:422
msgid "Add Fonts"
msgstr "添加字体"
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
msgid "You did not select anything to delete."
msgstr "您没有选择要删除的内容。"
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
msgid "Nothing to Delete"
msgstr "没有可删除的"
-#: kcmfontinst/KCmFontInst.cpp:454
+#: kcmfontinst/KCmFontInst.cpp:455
msgid ""
"<qt>Do you really want to delete\n"
" <b>'%1'</b>?</qt>"
@@ -105,22 +106,22 @@ msgstr ""
"<qt>您真的想删除\n"
"<b>“%1”</b>吗?</qt>"
-#: kcmfontinst/KCmFontInst.cpp:455
+#: kcmfontinst/KCmFontInst.cpp:456
msgid "Delete Font"
msgstr "删除字体"
-#: kcmfontinst/KCmFontInst.cpp:459
+#: kcmfontinst/KCmFontInst.cpp:460
#, c-format
msgid ""
"_n: Do you really want to delete this font?\n"
"Do you really want to delete these %n fonts?"
msgstr "您真的想删除这 %n 款字体吗?"
-#: kcmfontinst/KCmFontInst.cpp:461
+#: kcmfontinst/KCmFontInst.cpp:462
msgid "Delete Fonts"
msgstr "删除字体"
-#: kcmfontinst/KCmFontInst.cpp:535
+#: kcmfontinst/KCmFontInst.cpp:536
msgid ""
"There are no printable fonts.\n"
"You can only print non-bitmap fonts."
@@ -128,29 +129,29 @@ msgstr ""
"没有可打印的字体。\n"
"您只能打印非位图字体。"
-#: kcmfontinst/KCmFontInst.cpp:536
+#: kcmfontinst/KCmFontInst.cpp:537
msgid "Cannot Print"
msgstr "无法打印"
-#: kcmfontinst/KCmFontInst.cpp:561
+#: kcmfontinst/KCmFontInst.cpp:562
#, c-format
msgid ""
"_n: One Font\n"
"%n Fonts"
msgstr "%n 款字体"
-#: kcmfontinst/KCmFontInst.cpp:581
+#: kcmfontinst/KCmFontInst.cpp:582
msgid "(%1 Total)"
msgstr "(%1 全部)"
-#: kcmfontinst/KCmFontInst.cpp:584
+#: kcmfontinst/KCmFontInst.cpp:585
#, c-format
msgid ""
"_n: One Family\n"
"%n Families"
msgstr "%n 个字体族"
-#: kcmfontinst/KCmFontInst.cpp:611
+#: kcmfontinst/KCmFontInst.cpp:612
msgid ""
"<p>Please note that any open applications will need to be restarted in order "
"for any changes to be noticed."
@@ -162,13 +163,13 @@ msgstr ""
"<p>"
"<p>(您还需要重新启动次应用程序,以便使用新安装的字体打印。)</p>"
-#: kcmfontinst/KCmFontInst.cpp:615
+#: kcmfontinst/KCmFontInst.cpp:616
msgid ""
"Please note that any open applications will need to be restarted in order for "
"any changes to be noticed."
msgstr "请注意,要让任何更改生效,您必须重新启动已打开的任何应用程序。"
-#: kcmfontinst/KCmFontInst.cpp:618 viewpart/FontViewPart.cpp:244
+#: kcmfontinst/KCmFontInst.cpp:619 viewpart/FontViewPart.cpp:244
msgid "Success"
msgstr "成功"
@@ -297,6 +298,44 @@ msgstr "更新"
msgid "Do Not Update"
msgstr "不更新"
+#: lib/FcEngine.cpp:522
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
+msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
+
+#: lib/FcEngine.cpp:576
+msgid "ERROR: Could not determine font's name."
+msgstr "错误:无法确定字体的名称。"
+
+#: lib/FcEngine.cpp:580
+msgid ""
+"_n: %1 [1 pixel]\n"
+"%1 [%n pixels]"
+msgstr "%1 [%n 像素]"
+
+#: lib/FcEngine.cpp:697
+msgid ""
+"_: A sentence that uses all of the letters of the alphabet\n"
+"The quick brown fox jumps over the lazy dog"
+msgstr "明日复明日·万事成蹉跎"
+
+#: lib/FcEngine.cpp:711
+msgid ""
+"_: All of the letters of the alphabet, uppercase\n"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+#: lib/FcEngine.cpp:716
+msgid ""
+"_: All of the letters of the alphabet, lowercase\n"
+"abcdefghijklmnopqrstuvwxyz"
+msgstr "abcdefghijklmnopqrstuvwxyz"
+
+#: lib/FcEngine.cpp:721
+msgid ""
+"_: Numbers and characters\n"
+"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+msgstr "0123456789.:,;(*!?'/\\\")$%^&-+@~#<>{}[]"
+
#: tdefile-plugin/KFileFont.cpp:287
msgid "General"
msgstr "常规"
@@ -413,44 +452,6 @@ msgid ""
"Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\"."
msgstr "抱歉,您无法重命名、移动、复制或删除“%1”或“%2”。"
-#: lib/FcEngine.cpp:522
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
-
-#: lib/FcEngine.cpp:576
-msgid "ERROR: Could not determine font's name."
-msgstr "错误:无法确定字体的名称。"
-
-#: lib/FcEngine.cpp:580
-msgid ""
-"_n: %1 [1 pixel]\n"
-"%1 [%n pixels]"
-msgstr "%1 [%n 像素]"
-
-#: lib/FcEngine.cpp:697
-msgid ""
-"_: A sentence that uses all of the letters of the alphabet\n"
-"The quick brown fox jumps over the lazy dog"
-msgstr "明日复明日·万事成蹉跎"
-
-#: lib/FcEngine.cpp:711
-msgid ""
-"_: All of the letters of the alphabet, uppercase\n"
-"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-msgstr "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-#: lib/FcEngine.cpp:716
-msgid ""
-"_: All of the letters of the alphabet, lowercase\n"
-"abcdefghijklmnopqrstuvwxyz"
-msgstr "abcdefghijklmnopqrstuvwxyz"
-
-#: lib/FcEngine.cpp:721
-msgid ""
-"_: Numbers and characters\n"
-"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
-msgstr "0123456789.:,;(*!?'/\\\")$%^&-+@~#<>{}[]"
-
#: viewpart/FontPreview.cpp:92
msgid " No preview available"
msgstr "没有预览"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po b/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
index 0b153e016f1..18c95f04a32 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdehtmlkttsd\n"
-"POT-Creation-Date: 2006-01-04 03:13+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-02-12 17:15+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
index 14d03bc763f..6b48270ac95 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_finger\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-06-03 17:36GMT\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
index 983889065cf..3065c31ef2b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_fish\n"
-"POT-Creation-Date: 2006-11-05 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-07-11 23:17+0800\n"
"Last-Translator: Sun Fang <sun_xp@msn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
index 8beed8c3d41..c75bc04feb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_floppy\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-24 11:03+0800\n"
"Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
index d390da8053b..d75ed7225d6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_home\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 06:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
index 0929f4882e0..26c39e48ae6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
@@ -1,10 +1,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_ldap\n"
-"POT-Creation-Date: 2007-11-01 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-05-03 13:29+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
index bd633917118..f4835a65a21 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_mac\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-09-24 23:28+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
index e18cc3497c5..b4803a1d5cf 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_man\n"
-"POT-Creation-Date: 2007-05-29 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-05 00:21+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +29,11 @@ msgid ""
"Your emails"
msgstr "li-zongliang@21cn.com"
-#: tdeio_man.cpp:465
+#: kmanpart.cpp:65
+msgid "KMan"
+msgstr "KMan"
+
+#: tdeio_man.cpp:471
msgid ""
"No man page matching to %1 found."
"<br>"
@@ -44,104 +49,100 @@ msgstr ""
"您还应该注意是否正确输入了字母的大小写。"
"<br>如果所有内容都输入正确了的话,那么您可能需要设定手册页的正确搜索路径,此时应查看一下环境变量 MANPATH 或 /etc 目录中的文件。"
-#: tdeio_man.cpp:496
+#: tdeio_man.cpp:508
msgid "Open of %1 failed."
msgstr "打开 %1 失败。"
-#: tdeio_man.cpp:600 tdeio_man.cpp:618
+#: tdeio_man.cpp:649 tdeio_man.cpp:667
msgid "Man output"
msgstr "Man 输出"
-#: tdeio_man.cpp:604
+#: tdeio_man.cpp:653
msgid "<body><h1>TDE Man Viewer Error</h1>"
msgstr "<body><h1>TDE 手册查看器错误</h1>"
-#: tdeio_man.cpp:622
+#: tdeio_man.cpp:671
msgid "There is more than one matching man page."
msgstr "有多个匹配的手册页。"
-#: tdeio_man.cpp:633
+#: tdeio_man.cpp:682
msgid ""
"Note: if you read a man page in your language, be aware it can contain some "
"mistakes or be obsolete. In case of doubt, you should have a look at the "
"English version."
msgstr "请注意:如果您正在阅读非英语的手册页,那么该手册页很可能包含错误或已过时。如果您怀有疑问的话,请以英文版本为准。"
-#: tdeio_man.cpp:723
+#: tdeio_man.cpp:772
msgid "User Commands"
msgstr "用户命令"
-#: tdeio_man.cpp:725
+#: tdeio_man.cpp:774
msgid "System Calls"
msgstr "系统调用"
-#: tdeio_man.cpp:727
+#: tdeio_man.cpp:776
msgid "Subroutines"
msgstr "子例程"
-#: tdeio_man.cpp:729
+#: tdeio_man.cpp:778
msgid "Perl Modules"
msgstr "Perl 模块"
-#: tdeio_man.cpp:731
+#: tdeio_man.cpp:780
msgid "Network Functions"
msgstr "网络函数"
-#: tdeio_man.cpp:733
+#: tdeio_man.cpp:782
msgid "Devices"
msgstr "设备"
-#: tdeio_man.cpp:735
+#: tdeio_man.cpp:784
msgid "File Formats"
msgstr "文件格式"
-#: tdeio_man.cpp:737
+#: tdeio_man.cpp:786
msgid "Games"
msgstr "游戏"
-#: tdeio_man.cpp:741
+#: tdeio_man.cpp:790
msgid "System Administration"
msgstr "系统管理"
-#: tdeio_man.cpp:743
+#: tdeio_man.cpp:792
msgid "Kernel"
msgstr "内核"
-#: tdeio_man.cpp:745
+#: tdeio_man.cpp:794
msgid "Local Documentation"
msgstr "本地文档"
-#: tdeio_man.cpp:747
+#: tdeio_man.cpp:796
msgid "New"
msgstr "新增部分"
-#: tdeio_man.cpp:782 tdeio_man.cpp:786 tdeio_man.cpp:1209
+#: tdeio_man.cpp:831 tdeio_man.cpp:835 tdeio_man.cpp:1258
msgid "UNIX Manual Index"
msgstr "UNIX 手册索引"
-#: tdeio_man.cpp:801
+#: tdeio_man.cpp:850
msgid "Section "
msgstr "节"
-#: tdeio_man.cpp:1214
+#: tdeio_man.cpp:1263
msgid "Index for Section %1: %2"
msgstr "章节索引 %1:%2"
-#: tdeio_man.cpp:1219
+#: tdeio_man.cpp:1268
msgid "Generating Index"
msgstr "生成索引"
-#: tdeio_man.cpp:1529
+#: tdeio_man.cpp:1584
msgid ""
"Could not find the sgml2roff program on your system. Please install it, if "
"necessary, and extend the search path by adjusting the environment variable "
"PATH before starting TDE."
msgstr "在您的系统中未找到 sgml2roff 程序。请安装它,并且必要的话在启动 TDE 前调整 PATH 环境变量,扩展搜索路径。"
-#: kmanpart.cpp:65
-msgid "KMan"
-msgstr "KMan"
-
#~ msgid "No man page matching to %1 found. You can extend the search path by setting the environment variable MANPATH before starting TDE."
#~ msgstr "没有找到与 %1 匹配的手册页。你可能在启动 TDE 前设置环境变量 MANPATH 来扩充搜索路径。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index ac206d17d40..9355b70b693 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-09 13:07+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,60 +25,73 @@ msgid ""
"Your emails"
msgstr "fundawang@linux.net.cn"
-#: tdeio_media.cpp:35
-msgid "Protocol name"
-msgstr "协议名称"
-
-#: tdeio_media.cpp:36 tdeio_media.cpp:37
-msgid "Socket name"
-msgstr "套接字名称"
-
-#: mediaimpl.cpp:86 mediaimpl.cpp:113 mediaimpl.cpp:139 mediaimpl.cpp:173
-#: mediaimpl.cpp:193 mediaimpl.cpp:214
-#: mounthelper/tdeio_media_mounthelper.cpp:45
+#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
+#: mediaimpl.cpp:197 mediaimpl.cpp:218
+#: mounthelper/tdeio_media_mounthelper.cpp:48
+#: mounthelper/tdeio_media_mounthelper.cpp:252
msgid "The TDE mediamanager is not running."
msgstr "TDE 介质管理器未运行。"
-#: mediaimpl.cpp:183
+#: mediaimpl.cpp:187
msgid "This media name already exists."
msgstr "此介质名称已存在。"
-#: mediaimpl.cpp:226
+#: mediaimpl.cpp:230 mediaimpl.cpp:293
msgid "No such medium."
msgstr "没有此类媒体。"
-#: mediaimpl.cpp:259 mediamanager/halbackend.cpp:972
-#: mediamanager/halbackend.cpp:981 mediamanager/halbackend.cpp:1285
-#: mediamanager/halbackend.cpp:1296 mounthelper/tdeio_media_mounthelper.cpp:53
+#: mediaimpl.cpp:238
+msgid "The drive is encrypted."
+msgstr ""
+
+#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1260
+#: mediamanager/halbackend.cpp:1269 mediamanager/halbackend.cpp:1659
+#: mediamanager/halbackend.cpp:1676 mediamanager/halbackend.cpp:1687
+#: mediamanager/halbackend.cpp:1789 mediamanager/halbackend.cpp:1797
+#: mediamanager/halbackend.cpp:1804 mediamanager/halbackend.cpp:1844
+#: mediamanager/halbackend.cpp:1850 mediamanager/halbackend.cpp:1857
+#: mounthelper/tdeio_media_mounthelper.cpp:56
msgid "Internal Error"
msgstr "内部错误"
-#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 16
#: rc.cpp:3
#, no-c-format
+msgid "PropertiesPageGUI"
+msgstr ""
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 27
+#: rc.cpp:6
+#, fuzzy, no-c-format
+msgid "Use default mount options"
+msgstr "通用挂载选项"
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#: rc.cpp:9
+#, no-c-format
msgid "Generic Mount Options"
msgstr "通用挂载选项"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 54
-#: rc.cpp:6
+#: rc.cpp:12
#, no-c-format
msgid "Read only"
msgstr "只读"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 57
-#: rc.cpp:9
+#: rc.cpp:15
#, no-c-format
msgid "Mount the file system read-only."
msgstr "以只读方式挂载文件系统。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 65
-#: rc.cpp:12
+#: rc.cpp:18
#, no-c-format
msgid "Quiet"
msgstr "安静"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 68
-#: rc.cpp:15
+#: rc.cpp:21
#, no-c-format
msgid ""
"Attempts to chown or chmod files do not return errors, although they fail. Use "
@@ -85,37 +99,37 @@ msgid ""
msgstr "即使对 chown 或chmod 文件的尝试失败,也不会返回错误。请谨慎使用!"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 76
-#: rc.cpp:18
+#: rc.cpp:24
#, no-c-format
msgid "Synchronous"
msgstr "同步"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 79
-#: rc.cpp:21
+#: rc.cpp:27
#, no-c-format
msgid "All I/O to the file system should be done synchronously."
msgstr "所有针对文件系统的 I/O 操作应同步执行。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 87
-#: rc.cpp:24
+#: rc.cpp:30
#, no-c-format
msgid "Access time updates"
msgstr "访问时间更新"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 90
-#: rc.cpp:27
+#: rc.cpp:33
#, no-c-format
msgid "Update inode access time for each access."
msgstr "更新每次 inode 访问的时间。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 106
-#: rc.cpp:30
+#: rc.cpp:36
#, no-c-format
msgid "Mountpoint:"
msgstr "挂载点:"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 112
-#: rc.cpp:33
+#: rc.cpp:39
#, no-c-format
msgid ""
"Under what directory this file system shall be mounted. Please note that there "
@@ -124,44 +138,44 @@ msgid ""
msgstr "该文件系统应挂载到什么目录下。请注意,不能保证系统将遵循您的意愿。目录必须位于 /media 之下,但是它尚不存在。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 130
-#: rc.cpp:36
+#: rc.cpp:42
#, no-c-format
msgid "Mount automatically"
msgstr "自动挂载"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 133
-#: rc.cpp:39
+#: rc.cpp:45
#, no-c-format
msgid "Mount this file system automatically."
msgstr "自动挂载该文件系统。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 145
-#: rc.cpp:42
+#: rc.cpp:48
#, no-c-format
msgid "Filesystem Specific Mount Options"
msgstr "特定于文件系统的装入选项"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 164
-#: rc.cpp:45
+#: rc.cpp:51
#, no-c-format
msgid "Flushed IO"
msgstr "IO 已刷新"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 167
-#: rc.cpp:48
+#: rc.cpp:54
#, no-c-format
msgid ""
"Always flush all data to the hot plug devices immediately and don't cache it."
msgstr "始终将立即刷新热插拔设备上的数据而不会对其进行缓存。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 175
-#: rc.cpp:51
+#: rc.cpp:57
#, no-c-format
msgid "UTF-8 charset"
msgstr "UTF-8 字符集"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 178
-#: rc.cpp:54
+#: rc.cpp:60
#, no-c-format
msgid ""
"UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
@@ -169,25 +183,25 @@ msgid ""
msgstr "UTF8 是控制台使用的 Unicode 文件系统安全 8 位编码。可通过此选项对文件系统启用它。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 186
-#: rc.cpp:57
+#: rc.cpp:63
#, no-c-format
msgid "Mount as user"
msgstr "作为用户挂载"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 189
-#: rc.cpp:60
+#: rc.cpp:66
#, no-c-format
msgid "Mount this file system as user."
msgstr "以用户的身份装入该文件。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 205
-#: rc.cpp:63
+#: rc.cpp:69
#, no-c-format
msgid "Journaling:"
msgstr "日志:"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 220
-#: rc.cpp:66 rc.cpp:87
+#: rc.cpp:72 rc.cpp:93
#, no-c-format
msgid ""
"<h2>Specifies the journalling mode for file data. Metadata is always "
@@ -225,31 +239,31 @@ msgstr ""
"它保证了内部文件系统的完整性,但是在崩溃和日志恢复之后,它可能允许旧数据出现在文件中。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 226
-#: rc.cpp:78
+#: rc.cpp:84
#, no-c-format
msgid "All Data"
msgstr "所有数据"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 231
-#: rc.cpp:81
+#: rc.cpp:87
#, no-c-format
msgid "Ordered"
msgstr "按顺序"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 236
-#: rc.cpp:84
+#: rc.cpp:90
#, no-c-format
msgid "Write Back"
msgstr "回写"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 270
-#: rc.cpp:99
+#: rc.cpp:105
#, no-c-format
msgid "Short names:"
msgstr "短名称:"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 288
-#: rc.cpp:102 rc.cpp:129
+#: rc.cpp:108 rc.cpp:135
#, no-c-format
msgid ""
"<h2>Defines the behaviour for creation and display of filenames which fit "
@@ -290,72 +304,80 @@ msgstr ""
" 按现状显示短名称;当短名称不全是大写时存储长名称。"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 294
-#: rc.cpp:117
+#: rc.cpp:123
#, no-c-format
msgid "Lower"
msgstr "小写"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 299
-#: rc.cpp:120
+#: rc.cpp:126
#, no-c-format
msgid "Windows 95"
msgstr "Windows 95"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 304
-#: rc.cpp:123
+#: rc.cpp:129
#, no-c-format
msgid "Windows NT"
msgstr "Windows NT"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 309
-#: rc.cpp:126
+#: rc.cpp:132
#, no-c-format
msgid "Mixed"
msgstr "混合"
#. i18n: file propsdlgplugin/propertiespagegui.ui line 342
-#: rc.cpp:144
+#: rc.cpp:150
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "文件系统:iso9660"
-#: tdefile-plugin/tdefilemediaplugin.cpp:173
+#: tdeio_media.cpp:36
+msgid "Protocol name"
+msgstr "协议名称"
+
+#: tdeio_media.cpp:37 tdeio_media.cpp:38
+msgid "Socket name"
+msgstr "套接字名称"
+
+#: tdefile-plugin/tdefilemediaplugin.cpp:183
msgid "Medium Information"
msgstr "介质信息"
-#: tdefile-plugin/tdefilemediaplugin.cpp:176
+#: tdefile-plugin/tdefilemediaplugin.cpp:186
msgid "Free"
msgstr "剩余"
-#: tdefile-plugin/tdefilemediaplugin.cpp:179
+#: tdefile-plugin/tdefilemediaplugin.cpp:189
msgid "Used"
msgstr "已用"
-#: tdefile-plugin/tdefilemediaplugin.cpp:182
+#: tdefile-plugin/tdefilemediaplugin.cpp:192
msgid "Total"
msgstr "总计"
-#: tdefile-plugin/tdefilemediaplugin.cpp:185
+#: tdefile-plugin/tdefilemediaplugin.cpp:195
msgid "Base URL"
msgstr "基 URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:186
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Mount Point"
msgstr "挂载点"
-#: tdefile-plugin/tdefilemediaplugin.cpp:187
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Device Node"
msgstr "设备节点"
-#: tdefile-plugin/tdefilemediaplugin.cpp:189
+#: tdefile-plugin/tdefilemediaplugin.cpp:199
msgid "Medium Summary"
msgstr "介质概览"
-#: tdefile-plugin/tdefilemediaplugin.cpp:191
+#: tdefile-plugin/tdefilemediaplugin.cpp:201
msgid "Usage"
msgstr "用量"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:203
msgid "Bar Graph"
msgstr "条形图"
@@ -375,8 +397,15 @@ msgstr "在新窗口中打开"
msgid "Unknown"
msgstr "未知"
+#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
+msgid "Decrypt"
+msgstr ""
+
#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1218 mediamanager/halbackend.cpp:1240
+#: mediamanager/halbackend.cpp:1591 mediamanager/halbackend.cpp:1613
+#: mediamanager/halbackend.cpp:1772 mediamanager/halbackend.cpp:1827
+#: mediamanager/tdehardwarebackend.cpp:1323
+#: mediamanager/tdehardwarebackend.cpp:1334
#, c-format
msgid "No such medium: %1"
msgstr "没有此类媒体: %1"
@@ -413,101 +442,342 @@ msgstr "远程共享"
msgid "Hard Disk"
msgstr "硬盘"
-#: mediamanager/halbackend.cpp:640
+#: mediamanager/halbackend.cpp:745 mediamanager/tdehardwarebackend.cpp:780
#, fuzzy
msgid "Unknown Drive"
msgstr "未知"
-#: mediamanager/halbackend.cpp:652
+#: mediamanager/halbackend.cpp:757 mediamanager/tdehardwarebackend.cpp:810
#, fuzzy
msgid "Floppy Drive"
msgstr "软盘"
-#: mediamanager/halbackend.cpp:660
+#: mediamanager/halbackend.cpp:765
#, fuzzy
msgid "Zip Drive"
msgstr "Zip 磁盘"
-#: mediamanager/halbackend.cpp:730
+#: mediamanager/halbackend.cpp:835 mediamanager/tdehardwarebackend.cpp:867
msgid "Camera"
msgstr "相机"
-#: mediamanager/halbackend.cpp:992
+#: mediamanager/halbackend.cpp:1217 mediamanager/halbackend.cpp:1243
+msgid "Authenticate"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1218
+msgid ""
+"<big><b>System policy prevents mounting internal media</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1244
+msgid ""
+"<big><b>System policy prevents unmounting media mounted by other users</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1280
msgid "Invalid filesystem type"
msgstr "无效的文件系统类型"
-#: mediamanager/halbackend.cpp:994 mediamanager/halbackend.cpp:1141
-#: mediamanager/halbackend.cpp:1317
-msgid "Permissions denied"
-msgstr "拒绝许可权限"
+#: mediamanager/halbackend.cpp:1282
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device node is not listed in /etc/fstab.</p>"
+msgstr ""
-#: mediamanager/halbackend.cpp:996
+#: mediamanager/halbackend.cpp:1286
msgid "Device is already mounted."
msgstr "设备已装入。"
-#: mediamanager/halbackend.cpp:1042
+#: mediamanager/halbackend.cpp:1336
msgid ""
"Moreover, programs still using the device have been detected. They are listed "
"below. You have to close them or change their working directory before "
"attempting to unmount the device again."
msgstr "此外,还检测到了仍然在使用设备的程序,程序清单列在下面。您需要关闭这些程序,或者更改其工作目录,然后再尝试卸载设备。"
-#: mediamanager/halbackend.cpp:1065 mediamanager/halbackend.cpp:1306
+#: mediamanager/halbackend.cpp:1377 mediamanager/tdehardwarebackend.cpp:1562
+msgid ""
+"Programs that were still using the device have been forcibly terminated. They "
+"are listed below."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1398 mediamanager/halbackend.cpp:1711
+#: mediamanager/tdehardwarebackend.cpp:1380
+#: mediamanager/tdehardwarebackend.cpp:1398
+#: mediamanager/tdehardwarebackend.cpp:1438
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> "
"and currently mounted at <b>%4</b> could not be unmounted. "
msgstr "设备 <b>%1</b> (%2) 名为<b>“%3”</b>,目前正挂载于 <b>%4</b>,现在无法卸载。"
-#: mediamanager/halbackend.cpp:1071
+#: mediamanager/halbackend.cpp:1404 mediamanager/tdehardwarebackend.cpp:1444
msgid "The following error was returned by umount command:"
msgstr "umount 命令返回了下列错误:"
-#: mediamanager/halbackend.cpp:1312
+#: mediamanager/halbackend.cpp:1474
+#, fuzzy
+msgid "Permission denied"
+msgstr "拒绝许可权限"
+
+#: mediamanager/halbackend.cpp:1558 mediamanager/tdehardwarebackend.cpp:1206
+msgid "Cannot mount encrypted drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1717
msgid "Unmounting failed due to the following error:"
msgstr "卸载失败,错误原因如下:"
-#: mediamanager/halbackend.cpp:1314
+#: mediamanager/halbackend.cpp:1719
msgid "Device is Busy:"
msgstr "设备正忙:"
-#: mediamanager/mediamanager.cpp:213 mediamanager/mediamanager.cpp:217
-#: mediamanager/mediamanager.cpp:226 mediamanager/mediamanager.cpp:230
+#: mediamanager/halbackend.cpp:1723
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device was originally mounted using TDE.</p>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1735
+msgid ""
+"%1"
+"<p><b>Would you like to forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1807
+msgid "Wrong password"
+msgstr ""
+
+#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
+#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
msgid "Feature only available with HAL"
msgstr "功能仅对于 HAL 可用"
-#: mounthelper/tdeio_media_mounthelper.cpp:74
+#: mediamanager/mediamanager.cpp:252
+#, fuzzy
+msgid "Feature only available with the TDE hardware backend"
+msgstr "功能仅对于 HAL 可用"
+
+#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
+#: mediamanager/mediamanager.cpp:275
+#, fuzzy
+msgid "Feature only available with HAL or TDE hardware backend"
+msgstr "功能仅对于 HAL 可用"
+
+#: mediamanager/tdehardwarebackend.cpp:452
+#: mediamanager/tdehardwarebackend.cpp:489
+#: mediamanager/tdehardwarebackend.cpp:720
+#, fuzzy
+msgid "%1 Removable Device"
+msgstr "可移动设备"
+
+#: mediamanager/tdehardwarebackend.cpp:497
+#, fuzzy
+msgid "Blank CD-ROM"
+msgstr "CD-ROM"
+
+#: mediamanager/tdehardwarebackend.cpp:506
+msgid "Blank CD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:515
+msgid "Blank CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:524
+msgid "Blank Magneto-Optical CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:533
+msgid "Blank Mount Ranier CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:542
+msgid "Blank Mount Ranier CD-RW-W"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:551
+msgid "Blank DVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:560
+msgid "Blank DVD-RAM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:569
+msgid "Blank DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:578
+msgid "Blank DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:587
+msgid "Blank Dual Layer DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:596
+msgid "Blank Dual Layer DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:605
+msgid "Blank DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:614
+msgid "Blank DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:623
+msgid "Blank Dual Layer DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:632
+msgid "Blank Dual Layer DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:641
+msgid "Blank BD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:650
+msgid "Blank BD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:659
+msgid "Blank BD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:668
+msgid "Blank HDDVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:677
+msgid "Blank HDDVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:686
+msgid "Blank HDDVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:693
+msgid "Audio CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:714
+msgid "%1 Fixed Disk (%2)"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:824
+#, fuzzy
+msgid "%1 Zip Disk"
+msgstr "Zip 磁盘"
+
+#: mediamanager/tdehardwarebackend.cpp:1186
+#: mediamanager/tdehardwarebackend.cpp:1366
+#, fuzzy
+msgid "Internal error"
+msgstr "内部错误"
+
+#: mediamanager/tdehardwarebackend.cpp:1213
+msgid ""
+"<qt>Unable to mount this device."
+"<p>Potential reasons include:"
+"<br>Improper device and/or user privilege level"
+"<br>Corrupt data on storage device"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1215
+#: mediamanager/tdehardwarebackend.cpp:1290
+#: mediamanager/tdehardwarebackend.cpp:1382
+#: mediamanager/tdehardwarebackend.cpp:1400
+msgid "<p>Technical details:<br>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1288
+msgid ""
+"<qt>Unable to mount this device."
+"<p>Potential reasons include:"
+"<br>Improper device and/or user privilege level"
+"<br>Corrupt data on storage device"
+"<br>Incorrect encryption password"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1394
+msgid ""
+"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
+"%4</b> can not be unmounted at this time."
+"<p>%5"
+"<p><b>Would you like to forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1521
+#, fuzzy
+msgid ""
+"Programs still using the device have been detected. They are listed below. You "
+"have to close them or change their working directory before attempting to "
+"unmount the device again."
+msgstr "此外,还检测到了仍然在使用设备的程序,程序清单列在下面。您需要关闭这些程序,或者更改其工作目录,然后再尝试卸载设备。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:77
msgid "%1 cannot be found."
msgstr "找不到 %1。"
-#: mounthelper/tdeio_media_mounthelper.cpp:81
+#: mounthelper/tdeio_media_mounthelper.cpp:84
msgid "%1 is not a mountable media."
msgstr "%1 不是可挂载的介质。"
-#: mounthelper/tdeio_media_mounthelper.cpp:166
+#: mounthelper/tdeio_media_mounthelper.cpp:99
+#, fuzzy
+msgid "%1 is not an encrypted media."
+msgstr "%1 不是可挂载的介质。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:105
+#, fuzzy
+msgid "%1 is already decrypted."
+msgstr "设备已装入。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:224
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "设备已经成功卸载,但无法打开托盘"
-#: mounthelper/tdeio_media_mounthelper.cpp:168
+#: mounthelper/tdeio_media_mounthelper.cpp:226
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "设备已经成功卸载,但尚未弹出"
-#: mounthelper/tdeio_media_mounthelper.cpp:182
+#: mounthelper/tdeio_media_mounthelper.cpp:271
+#, fuzzy
+msgid "Decrypt given URL"
+msgstr "卸载给出的 URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:272
msgid "Unmount given URL"
msgstr "卸载给出的 URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:183
+#: mounthelper/tdeio_media_mounthelper.cpp:273
msgid "Mount given URL (default)"
msgstr "挂载给定的 URL(默认)"
-#: mounthelper/tdeio_media_mounthelper.cpp:184
+#: mounthelper/tdeio_media_mounthelper.cpp:274
msgid "Eject given URL via tdeeject"
msgstr "通过 tdeeject 弹出给定 URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:185
+#: mounthelper/tdeio_media_mounthelper.cpp:275
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "卸载并弹出给定的 URL(某些 USB 设备需要)"
-#: mounthelper/tdeio_media_mounthelper.cpp:186
+#: mounthelper/tdeio_media_mounthelper.cpp:276
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
@@ -516,15 +786,15 @@ msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
msgid "Filesystem: %1"
msgstr "文件系统:%1"
-#: propsdlgplugin/propertiespage.cpp:196
+#: propsdlgplugin/propertiespage.cpp:207
msgid "Mountpoint has to be below /media"
msgstr "装入点必须位于 /media 之下"
-#: propsdlgplugin/propertiespage.cpp:211
+#: propsdlgplugin/propertiespage.cpp:223
msgid "Saving the changes failed"
msgstr "保存更改失败"
-#: propsdlgplugin/propsdlgshareplugin.cpp:67
+#: propsdlgplugin/propsdlgshareplugin.cpp:68
msgid "&Mounting"
msgstr "挂载(&M)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
index c9373367e8a..21220653fd1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_nfs\n"
-"POT-Creation-Date: 2005-06-10 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-06-03 17:42GMT\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
index 106905d0c5d..65c6c435cde 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_nntp\n"
-"POT-Creation-Date: 2005-06-20 01:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-06-03 17:43GMT\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
index 5a544fc03cd..c6f9e6d6719 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_pop3\n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 00:10+0800\n"
"Last-Translator: Mai Hao Hui <mhh@126.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -117,9 +118,10 @@ msgstr ""
"请选择另外一种验证方式。"
#: pop3.cc:735
+#, fuzzy
msgid ""
"Your POP3 server claims to support TLS but negotiation was unsuccessful. You "
-"can disable TLS in TDE using the crypto settings module."
+"can disable TLS in KDE using the crypto settings module."
msgstr "您的 POP3 服务器声明支持 TLS,但是协商失败了。您可以在 TDE 的加密设置模块中禁用 TLS。"
#: pop3.cc:746
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
index 77a7c5059b4..1e924520df5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_print 1.0\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:15+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -80,14 +81,14 @@ msgstr "无法确定 %1 的源类型。"
msgid "Unable to retrieve printer information for %1."
msgstr "无法得到 %1 的打印机信息。"
-#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724 tdeio_print.cpp:825
-#: tdeio_print.cpp:896
+#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724
+#: tdeio_print.cpp:825 tdeio_print.cpp:896
#, c-format
msgid "Unable to load template %1"
msgstr "无法加载模板 %1"
-#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696 tdeio_print.cpp:697
-#: tdeio_print.cpp:735 tdeio_print.cpp:736
+#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696
+#: tdeio_print.cpp:697 tdeio_print.cpp:735 tdeio_print.cpp:736
#, c-format
msgid "Properties of %1"
msgstr "%1 的属性"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
index c50ede188e6..5258a57c9c2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
@@ -4,14 +4,19 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_remot\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: remoteimpl.cpp:198
+msgid "Add a Network Folder"
+msgstr "添加网络文件夹"
+
#: tdeio_remote.cpp:34
msgid "Protocol name"
msgstr "协议名称"
@@ -19,7 +24,3 @@ msgstr "协议名称"
#: tdeio_remote.cpp:35 tdeio_remote.cpp:36
msgid "Socket name"
msgstr "套接字名称"
-
-#: remoteimpl.cpp:198
-msgid "Add a Network Folder"
-msgstr "添加网络文件夹"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
index 965b979c20d..ae2e25568b8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_settings\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-11-11 15:13+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
index 3fb1f4c7262..d309c344550 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
@@ -6,230 +6,231 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_sftp\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 13:34+0800\n"
"Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0\n"
+#: ksshprocess.cpp:408
+msgid "Cannot specify a subsystem and command at the same time."
+msgstr "不能同时指定子系统和命令。"
+
+#: ksshprocess.cpp:753
+msgid "No options provided for ssh execution."
+msgstr "没有指定执行 ssh 的选项。"
+
+#: ksshprocess.cpp:761
+msgid "Failed to execute ssh process."
+msgstr "启动 ssh 进程失败。"
+
+#: ksshprocess.cpp:786 ksshprocess.cpp:815 ksshprocess.cpp:934
+#: ksshprocess.cpp:1006
+msgid "Error encountered while talking to ssh."
+msgstr "和 ssh 通信时发生错误。"
+
+#: ksshprocess.cpp:820 ksshprocess.cpp:967 tdeio_sftp.cpp:737
+msgid "Connection closed by remote host."
+msgstr "远程主机关闭了连接。"
+
+#: ksshprocess.cpp:866
+msgid "Please supply a password."
+msgstr "请提供密码。"
+
+#: ksshprocess.cpp:905
+msgid "Please supply the passphrase for your SSH private key."
+msgstr "请提供您 SSH 私有密钥的口令句。"
+
+#: ksshprocess.cpp:919
+msgid "Authentication to %1 failed"
+msgstr "到 %1 的认证失败"
+
+#: ksshprocess.cpp:942
+msgid ""
+"The identity of the remote host '%1' could not be verified because the host's "
+"key is not in the \"known hosts\" file."
+msgstr "因为远程主机的密钥不在“已知主机”文件中,远程主机“%1”的身份不能确认。"
+
+#: ksshprocess.cpp:948
+msgid ""
+" Manually, add the host's key to the \"known hosts\" file or contact your "
+"administrator."
+msgstr "请手工将主机的密钥添加到“已知主机”文件中,或联系网络管理员。"
+
+#: ksshprocess.cpp:954
+msgid " Manually, add the host's key to %1 or contact your administrator."
+msgstr "请手工将主机的密钥添加到 %1,或联系网络管理员。"
+
+#: ksshprocess.cpp:986
+msgid ""
+"The identity of the remote host '%1' could not be verified. The host's key "
+"fingerprint is:\n"
+"%2\n"
+"You should verify the fingerprint with the host's administrator before "
+"connecting.\n"
+"\n"
+"Would you like to accept the host's key and connect anyway? "
+msgstr ""
+"程序不能检验远程主机“%1”的身份. 主机的密钥指纹是:\n"
+"%2\n"
+"在连接之前,您应该跟主机的管理员核对密钥指纹。\n"
+"您要接受该密钥并继续连接吗? "
+
+#: ksshprocess.cpp:1014
+msgid ""
+"WARNING: The identity of the remote host '%1' has changed!\n"
+"\n"
+"Someone could be eavesdropping on your connection, or the administrator may "
+"have just changed the host's key. Either way, you should verify the host's key "
+"fingerprint with the host's administrator. The key fingerprint is:\n"
+"%2\n"
+"Add the correct host key to \"%3\" to get rid of this message."
+msgstr ""
+"警告:远程主机“%1”的身份已经改变!\n"
+"\n"
+"也许有人在窃听您的网络连接,或者是管理员可能改变了主机的密钥。不管怎样,您应该与主机的管理员核实主机的密钥。主机的密钥指纹是:\n"
+"%2\n"
+"请将正确的主机密钥添加到“%3” 来消除这条信息。"
+
+#: ksshprocess.cpp:1049
+msgid ""
+"WARNING: The identity of the remote host '%1' has changed!\n"
+"\n"
+"Someone could be eavesdropping on your connection, or the administrator may "
+"have just changed the host's key. Either way, you should verify the host's key "
+"fingerprint with the host's administrator before connecting. The key "
+"fingerprint is:\n"
+"%2\n"
+"\n"
+"Would you like to accept the host's new key and connect anyway?"
+msgstr ""
+"警告:远程主机“%1”的身份已经改变!\n"
+"\n"
+"也许有人在窃听您的网络连接,或者是管理员可能改变了主机的密钥。不管怎样,连接前您应该与主机的管理员核实主机的密钥。主机的密钥指纹是:\n"
+"%2\n"
+"您要接受新的密钥并继续连接吗? "
+
+#: ksshprocess.cpp:1073
+msgid "Host key was rejected."
+msgstr "主机密钥被拒绝。"
+
#: tdeio_sftp.cpp:427
msgid "An internal error occurred. Please retry the request again."
msgstr "发生了内部错误。请重试请求。"
-#: tdeio_sftp.cpp:510
+#: tdeio_sftp.cpp:506
msgid "Opening SFTP connection to host <b>%1:%2</b>"
msgstr "正在打开到主机 <b>%1:%2</b> 的连接"
-#: tdeio_sftp.cpp:514
+#: tdeio_sftp.cpp:510
msgid "No hostname specified"
msgstr "没有指定主机"
-#: tdeio_sftp.cpp:526
+#: tdeio_sftp.cpp:522
msgid "SFTP Login"
msgstr "SFTP 登录"
-#: tdeio_sftp.cpp:528
+#: tdeio_sftp.cpp:524
msgid "site:"
msgstr "主机:"
-#: tdeio_sftp.cpp:629
+#: tdeio_sftp.cpp:625
msgid "Please enter your username and key passphrase."
msgstr "请输入您的用户名和密钥口令句。"
-#: tdeio_sftp.cpp:631
+#: tdeio_sftp.cpp:627
msgid "Please enter your username and password."
msgstr "请输入您的用户名和密码。"
-#: tdeio_sftp.cpp:639
+#: tdeio_sftp.cpp:635
msgid "Incorrect username or password"
msgstr "用户名或密码不正确"
-#: tdeio_sftp.cpp:644
+#: tdeio_sftp.cpp:640
msgid "Please enter a username and password"
msgstr "请输入用户名和密码"
-#: tdeio_sftp.cpp:703
+#: tdeio_sftp.cpp:699
msgid "Warning: Cannot verify host's identity."
msgstr "警告:不能检验主机的身份。"
-#: tdeio_sftp.cpp:714
+#: tdeio_sftp.cpp:710
msgid "Warning: Host's identity changed."
msgstr "警告:主机身份密钥已经更改。"
-#: tdeio_sftp.cpp:725 tdeio_sftp.cpp:726
+#: tdeio_sftp.cpp:721 tdeio_sftp.cpp:722
msgid "Authentication failed."
msgstr "认证失败。"
-#: tdeio_sftp.cpp:740 tdeio_sftp.cpp:755
+#: tdeio_sftp.cpp:736 tdeio_sftp.cpp:751
msgid "Connection failed."
msgstr "连接失败。"
-#: tdeio_sftp.cpp:741 ksshprocess.cpp:810 ksshprocess.cpp:957
-msgid "Connection closed by remote host."
-msgstr "远程主机关闭了连接。"
-
-#: tdeio_sftp.cpp:756
+#: tdeio_sftp.cpp:752
#, c-format
msgid "Unexpected SFTP error: %1"
msgstr "意外的 SFTP 错误:%1"
-#: tdeio_sftp.cpp:800
+#: tdeio_sftp.cpp:796
#, c-format
msgid "SFTP version %1"
msgstr "SFTP 版本 %1"
-#: tdeio_sftp.cpp:806
+#: tdeio_sftp.cpp:802
msgid "Protocol error."
msgstr "协议错误。"
-#: tdeio_sftp.cpp:812
+#: tdeio_sftp.cpp:808
#, c-format
msgid "Successfully connected to %1"
msgstr "成功连接到 %1"
-#: tdeio_sftp.cpp:1047
+#: tdeio_sftp.cpp:1043
msgid "An internal error occurred. Please try again."
msgstr "发生了内部错误。请重试。"
-#: tdeio_sftp.cpp:1068
+#: tdeio_sftp.cpp:1064
msgid ""
"Unknown error was encountered while copying the file to '%1'. Please try again."
msgstr "试图将文件复制为“%1”时遇到了未知错误。请重试。"
-#: tdeio_sftp.cpp:1318
+#: tdeio_sftp.cpp:1314
msgid "The remote host does not support renaming files."
msgstr "远程主机不支持文件更名。"
-#: tdeio_sftp.cpp:1367
+#: tdeio_sftp.cpp:1363
msgid "The remote host does not support creating symbolic links."
msgstr "远程主机不支持创建符号连接。"
-#: tdeio_sftp.cpp:1492
+#: tdeio_sftp.cpp:1488
msgid "Connection closed"
msgstr "连接已关闭"
-#: tdeio_sftp.cpp:1494
+#: tdeio_sftp.cpp:1490
msgid "Could not read SFTP packet"
msgstr "无法读取SFTP包"
-#: tdeio_sftp.cpp:1611
+#: tdeio_sftp.cpp:1607
msgid "SFTP command failed for an unknown reason."
msgstr "SFTP 命令执行失败,原因未知。"
-#: tdeio_sftp.cpp:1615
+#: tdeio_sftp.cpp:1611
msgid "The SFTP server received a bad message."
msgstr "SFTP服务器收到了一个损坏的信息。"
-#: tdeio_sftp.cpp:1619
+#: tdeio_sftp.cpp:1615
msgid "You attempted an operation unsupported by the SFTP server."
msgstr "您企图执行SFTP服务器不支持的操作。"
-#: tdeio_sftp.cpp:1623
+#: tdeio_sftp.cpp:1619
#, c-format
msgid "Error code: %1"
msgstr "错误代码:%1"
-#: ksshprocess.cpp:408
-msgid "Cannot specify a subsystem and command at the same time."
-msgstr "不能同时指定子系统和命令。"
-
-#: ksshprocess.cpp:743
-msgid "No options provided for ssh execution."
-msgstr "没有指定执行 ssh 的选项。"
-
-#: ksshprocess.cpp:751
-msgid "Failed to execute ssh process."
-msgstr "启动 ssh 进程失败。"
-
-#: ksshprocess.cpp:776 ksshprocess.cpp:805 ksshprocess.cpp:924
-#: ksshprocess.cpp:996
-msgid "Error encountered while talking to ssh."
-msgstr "和 ssh 通信时发生错误。"
-
-#: ksshprocess.cpp:856
-msgid "Please supply a password."
-msgstr "请提供密码。"
-
-#: ksshprocess.cpp:895
-msgid "Please supply the passphrase for your SSH private key."
-msgstr "请提供您 SSH 私有密钥的口令句。"
-
-#: ksshprocess.cpp:909
-msgid "Authentication to %1 failed"
-msgstr "到 %1 的认证失败"
-
-#: ksshprocess.cpp:932
-msgid ""
-"The identity of the remote host '%1' could not be verified because the host's "
-"key is not in the \"known hosts\" file."
-msgstr "因为远程主机的密钥不在“已知主机”文件中,远程主机“%1”的身份不能确认。"
-
-#: ksshprocess.cpp:938
-msgid ""
-" Manually, add the host's key to the \"known hosts\" file or contact your "
-"administrator."
-msgstr "请手工将主机的密钥添加到“已知主机”文件中,或联系网络管理员。"
-
-#: ksshprocess.cpp:944
-msgid " Manually, add the host's key to %1 or contact your administrator."
-msgstr "请手工将主机的密钥添加到 %1,或联系网络管理员。"
-
-#: ksshprocess.cpp:976
-msgid ""
-"The identity of the remote host '%1' could not be verified. The host's key "
-"fingerprint is:\n"
-"%2\n"
-"You should verify the fingerprint with the host's administrator before "
-"connecting.\n"
-"\n"
-"Would you like to accept the host's key and connect anyway? "
-msgstr ""
-"程序不能检验远程主机“%1”的身份. 主机的密钥指纹是:\n"
-"%2\n"
-"在连接之前,您应该跟主机的管理员核对密钥指纹。\n"
-"您要接受该密钥并继续连接吗? "
-
-#: ksshprocess.cpp:1004
-msgid ""
-"WARNING: The identity of the remote host '%1' has changed!\n"
-"\n"
-"Someone could be eavesdropping on your connection, or the administrator may "
-"have just changed the host's key. Either way, you should verify the host's key "
-"fingerprint with the host's administrator. The key fingerprint is:\n"
-"%2\n"
-"Add the correct host key to \"%3\" to get rid of this message."
-msgstr ""
-"警告:远程主机“%1”的身份已经改变!\n"
-"\n"
-"也许有人在窃听您的网络连接,或者是管理员可能改变了主机的密钥。不管怎样,您应该与主机的管理员核实主机的密钥。主机的密钥指纹是:\n"
-"%2\n"
-"请将正确的主机密钥添加到“%3” 来消除这条信息。"
-
-#: ksshprocess.cpp:1039
-msgid ""
-"WARNING: The identity of the remote host '%1' has changed!\n"
-"\n"
-"Someone could be eavesdropping on your connection, or the administrator may "
-"have just changed the host's key. Either way, you should verify the host's key "
-"fingerprint with the host's administrator before connecting. The key "
-"fingerprint is:\n"
-"%2\n"
-"\n"
-"Would you like to accept the host's new key and connect anyway?"
-msgstr ""
-"警告:远程主机“%1”的身份已经改变!\n"
-"\n"
-"也许有人在窃听您的网络连接,或者是管理员可能改变了主机的密钥。不管怎样,连接前您应该与主机的管理员核实主机的密钥。主机的密钥指纹是:\n"
-"%2\n"
-"您要接受新的密钥并继续连接吗? "
-
-#: ksshprocess.cpp:1063
-msgid "Host key was rejected."
-msgstr "主机密钥被拒绝。"
-
#~ msgid "Could not allocate memory for SFTP packet."
#~ msgstr "无法为SFTP包分配内存。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
index 82bed2a61bb..d96909df51f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_smb\n"
-"POT-Creation-Date: 2005-11-08 02:45+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 13:31+0800\n"
"Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +28,15 @@ msgstr ""
"服务器 = %1\n"
"共享 = %2"
-#: tdeio_smb_auth.cpp:175
+#: tdeio_smb_auth.cpp:176
msgid "libsmbclient failed to initialize"
msgstr "初始化 libsmbclient 失败"
-#: tdeio_smb_auth.cpp:181
+#: tdeio_smb_auth.cpp:182
msgid "libsmbclient failed to create context"
msgstr "libsmbclient 无法创建环境"
-#: tdeio_smb_auth.cpp:191
+#: tdeio_smb_auth.cpp:192
msgid "libsmbclient failed to initialize context"
msgstr "libsmbclient 无法初始化环境"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
index d3ec7d4f75b..96525ca8cc9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-10 23:00+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +39,10 @@ msgid ""
msgstr "您的 SMTP 服务器不支持 TLS。如果您想不加密连接,请禁用 TLS。"
#: command.cc:186
+#, fuzzy
msgid ""
"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
-"You can disable TLS in TDE using the crypto settings module."
+"You can disable TLS in KDE using the crypto settings module."
msgstr ""
"您的 SMTP 服务器声明支持 TLS,但协商失败了。\n"
"您可以使用TDE中的加密设置模块禁用 TLS。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
index 81466c311c3..a5fbcc0aea9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_system\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
index c1777e4bccd..23d92798c99 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_tar\n"
-"POT-Creation-Date: 2007-09-22 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 06:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
index 3cca659ae7a..5ae7b8177cd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
@@ -4,49 +4,50 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_thumbnail\n"
-"POT-Creation-Date: 2005-06-03 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 06:56+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: thumbnail.cpp:174
+#: thumbnail.cpp:175
msgid "No MIME Type specified."
msgstr "未指定任何 MIME 类型。"
-#: thumbnail.cpp:184
+#: thumbnail.cpp:185
msgid "No or invalid size specified."
msgstr "未指定大小或指定了无效的大小。"
-#: thumbnail.cpp:265
+#: thumbnail.cpp:266
msgid "No plugin specified."
msgstr "未指定插件。"
-#: thumbnail.cpp:283
+#: thumbnail.cpp:284
#, c-format
msgid "Cannot load ThumbCreator %1"
msgstr "无法装入缩略图创建器 %1"
-#: thumbnail.cpp:291
+#: thumbnail.cpp:292
#, c-format
msgid "Cannot create thumbnail for %1"
msgstr "无法创建 %1 的缩略图"
-#: thumbnail.cpp:358
+#: thumbnail.cpp:359
msgid "Failed to create a thumbnail."
msgstr "创建缩略图失败。"
-#: thumbnail.cpp:373
+#: thumbnail.cpp:374
msgid "Could not write image."
msgstr "无法写入图像。"
-#: thumbnail.cpp:398
+#: thumbnail.cpp:399
#, c-format
msgid "Failed to attach to shared memory segment %1"
msgstr "附加到共享内存段 %1 失败"
-#: thumbnail.cpp:403
+#: thumbnail.cpp:404
msgid "Image is too big for the shared memory segment"
msgstr "图像太大,共享内存段装不下"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
index 6809be54585..ae99158d1fc 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
@@ -4,39 +4,15 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_trash\n"
-"POT-Creation-Date: 2006-11-07 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ktrash.cpp:30
-msgid "Empty the contents of the trash"
-msgstr "清空回收站内容"
-
-#: ktrash.cpp:32
-msgid "Restore a trashed file to its original location"
-msgstr "将回收站中的文件恢复到原始位置"
-
-#: ktrash.cpp:34
-msgid "Ignored"
-msgstr "已忽略"
-
-#: ktrash.cpp:42
-msgid "ktrash"
-msgstr "ktrash"
-
-#: ktrash.cpp:43
-msgid ""
-"Helper program to handle the TDE trash can\n"
-"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
-"trash:/\""
-msgstr ""
-"处理 TDE 回收站的助手程序\n"
-"注意:要将文件移动到回收站,不应使用 ktrash,而应使用“kfmclient move url trash:/”"
-
#: tdeio_trash.cpp:46
msgid "Protocol name"
msgstr "协议名称"
@@ -45,20 +21,20 @@ msgstr "协议名称"
msgid "Socket name"
msgstr "套接字名称"
-#: tdeio_trash.cpp:97 tdeio_trash.cpp:160 tdeio_trash.cpp:317 tdeio_trash.cpp:349
-#: tdeio_trash.cpp:511 tdeio_trash.cpp:523
+#: tdeio_trash.cpp:96 tdeio_trash.cpp:159 tdeio_trash.cpp:316
+#: tdeio_trash.cpp:348 tdeio_trash.cpp:510 tdeio_trash.cpp:522
#, c-format
msgid "Malformed URL %1"
msgstr "URL %1 格式不对"
-#: tdeio_trash.cpp:116
+#: tdeio_trash.cpp:115
msgid ""
"The directory %1 does not exist anymore, so it is not possible to restore this "
"item to its original location. You can either recreate that directory and use "
"the restore operation again, or drag the item anywhere else to restore it."
msgstr "目录 %1 不存在,所以无法将此项目恢复到原始位置。您可以重新创建该目录,然后再使用一次恢复操作;也可以将项目拖曳到其它位置进行恢复。"
-#: tdeio_trash.cpp:145
+#: tdeio_trash.cpp:144
msgid "This file is already in the trash bin."
msgstr "此文件已经在回收站中了。"
@@ -74,5 +50,30 @@ msgstr "原始路径"
msgid "Date of Deletion"
msgstr "删除日期"
+#: ktrash.cpp:30
+msgid "Empty the contents of the trash"
+msgstr "清空回收站内容"
+
+#: ktrash.cpp:32
+msgid "Restore a trashed file to its original location"
+msgstr "将回收站中的文件恢复到原始位置"
+
+#: ktrash.cpp:34
+msgid "Ignored"
+msgstr "已忽略"
+
+#: ktrash.cpp:42
+msgid "ktrash"
+msgstr "ktrash"
+
+#: ktrash.cpp:43
+msgid ""
+"Helper program to handle the TDE trash can\n"
+"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
+"trash:/\""
+msgstr ""
+"处理 TDE 回收站的助手程序\n"
+"注意:要将文件移动到回收站,不应使用 ktrash,而应使用“kfmclient move url trash:/”"
+
#~ msgid "Helper program to handle the TDE trash can"
#~ msgstr "处理 TDE 回收站的助手程序"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po b/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
index 6e0be2cd5c5..09a75b509aa 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
@@ -1,10 +1,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdepasswd\n"
-"POT-Creation-Date: 2005-07-09 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-05-03 13:24+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po b/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
index 9410f6ed2b0..8ccbbe50e58 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeprint_part\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2002-10-10 12:09+0800\n"
"Last-Translator: Funda Wang <fundawang@en2china.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po b/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
index e2413e53d62..b7f60f22a7c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
@@ -6,112 +6,27 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeprintfax\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:53+0800\n"
"Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0\n"
-#: confsystem.cpp:50
-msgid "F&ax system:"
-msgstr "传真系统(&A):"
-
-#: confsystem.cpp:51
-msgid "Co&mmand:"
-msgstr "命令(&M):"
-
-#: confsystem.cpp:61
-msgid "Fax &server (if any):"
-msgstr "传真服务器(如果存在)(&S):"
-
-#: confsystem.cpp:62
-msgid "&Fax/Modem device:"
-msgstr "传真/调制解调器设备(&F):"
-
-#: confsystem.cpp:65
-msgid "Standard Modem Port"
-msgstr "标准调制解调器端口"
-
-#: confsystem.cpp:67
-#, c-format
-msgid "Serial Port #%1"
-msgstr "串口 #%1"
-
-#: confsystem.cpp:68
-msgid "Other"
-msgstr "其它"
-
-#: faxctrl.cpp:387
-msgid "Converting input files to PostScript"
-msgstr "将输入文件转换为 PostScript"
-
-#: faxctrl.cpp:462
-msgid "Sending fax to %1 (%2)"
-msgstr "发送传真给 %1 (%2)"
-
-#: faxctrl.cpp:467
-#, c-format
-msgid "Sending to fax using: %1"
-msgstr "发送到传真使用:%1"
-
-#: faxctrl.cpp:471
-msgid "Sending fax to %1..."
-msgstr "正在发送传真到 %1..."
-
-#: faxctrl.cpp:482
-msgid "Skipping %1..."
-msgstr "正在跳过 %1..."
-
-#: faxctrl.cpp:500
-msgid "Filtering %1..."
-msgstr "正在过滤 %1..."
-
-#: faxctrl.cpp:618
-msgid "Fax log"
-msgstr "传真日志"
-
-#: faxctrl.cpp:620
-msgid "Fax Log"
-msgstr "传真日志"
-
-#: faxctrl.cpp:629 faxctrl.cpp:659
-msgid "TDEPrint Fax Tool Log"
-msgstr "TDEPrint 传真工具日志"
-
-#: faxctrl.cpp:664
-msgid "Cannot open file for writing."
-msgstr "无法打开文件进行写入。"
-
-#: conffax.cpp:43
-msgid "High (204x196 dpi)"
-msgstr "高(204x196 dpi)"
-
-#: conffax.cpp:44
-msgid "Low (204x98 dpi)"
-msgstr "低(204x98 dpi)"
-
-#: conffax.cpp:45
-msgid "A4"
-msgstr "A4"
-
-#: conffax.cpp:46
-msgid "Letter"
-msgstr "信纸"
-
-#: conffax.cpp:47
-msgid "Legal"
-msgstr "Legal"
-
-#: conffax.cpp:48
-msgid "&Resolution:"
-msgstr "分辨率(&R):"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Li Zongliang"
-#: conffax.cpp:50
-msgid "&Paper size:"
-msgstr "纸张大小(&P):"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "li-zongliang@21cn.com"
#: confgeneral.cpp:41
msgid "&Name:"
@@ -129,60 +44,6 @@ msgstr "号码(&U):"
msgid "Replace international prefix '+' with:"
msgstr "将国际直拨前缀“+”替换为:"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Li Zongliang"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "li-zongliang@21cn.com"
-
-#: main.cpp:33
-msgid "A small fax utility to be used with tdeprint."
-msgstr "一个小传真实用工具和tdeprint一起使用。"
-
-#: main.cpp:39
-msgid "Phone number to fax to"
-msgstr "要发送传真的电话号码"
-
-#: main.cpp:40
-msgid "Send fax immediately"
-msgstr "立即发送传真"
-
-#: main.cpp:41
-msgid "Exit after sending"
-msgstr "发送后退出"
-
-#: main.cpp:42
-msgid "File to fax (added to the file list)"
-msgstr "要传真的文件(加进文件列表)"
-
-#: main.cpp:50
-msgid "KdeprintFax"
-msgstr "KdeprintFax"
-
-#: filterdlg.cpp:31
-msgid "Filter Parameters"
-msgstr "过滤器参数"
-
-#: filterdlg.cpp:37
-msgid "MIME type:"
-msgstr "MIME 类型:"
-
-#: filterdlg.cpp:38
-msgid "Command:"
-msgstr "命令:"
-
-#. i18n: file tdeprintfaxui.rc line 10
-#: rc.cpp:6
-#, no-c-format
-msgid "Fa&x"
-msgstr "传真(&X)"
-
#: conffilters.cpp:42
msgid "Mime Type"
msgstr "MIME 类型"
@@ -247,25 +108,33 @@ msgstr "过滤器"
msgid "Filters Configuration"
msgstr "过滤器配置"
-#: faxab.cpp:41 tdeprintfax.cpp:88
-msgid "Name"
-msgstr "名称"
+#: conffax.cpp:43
+msgid "High (204x196 dpi)"
+msgstr "高(204x196 dpi)"
-#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
-msgid "Fax Number"
-msgstr "传真号码"
+#: conffax.cpp:44
+msgid "Low (204x98 dpi)"
+msgstr "低(204x98 dpi)"
-#: faxab.cpp:44
-msgid "Entries:"
-msgstr "项目:"
+#: conffax.cpp:45
+msgid "A4"
+msgstr "A4"
-#: faxab.cpp:47
-msgid "&Edit Addressbook"
-msgstr "编辑地址薄(&E)"
+#: conffax.cpp:46
+msgid "Letter"
+msgstr "信纸"
-#: faxab.cpp:150
-msgid "No fax number found in your address book."
-msgstr "在您的地址薄中没有找到传真号码。"
+#: conffax.cpp:47
+msgid "Legal"
+msgstr "Legal"
+
+#: conffax.cpp:48
+msgid "&Resolution:"
+msgstr "分辨率(&R):"
+
+#: conffax.cpp:50
+msgid "&Paper size:"
+msgstr "纸张大小(&P):"
#: tdeprintfax.cpp:74
msgid "Move up"
@@ -279,6 +148,14 @@ msgstr "下移"
msgid "F&iles:"
msgstr "文件(&I):"
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
+msgid "Fax Number"
+msgstr "传真号码"
+
+#: faxab.cpp:41 tdeprintfax.cpp:88
+msgid "Name"
+msgstr "名称"
+
#: tdeprintfax.cpp:89
msgid "Enterprise"
msgstr "企业"
@@ -407,3 +284,131 @@ msgstr "企业(&E):"
#: tdeprintfax.cpp:593
msgid "Invalid fax number."
msgstr "无效的传真号码。"
+
+#: faxctrl.cpp:387
+msgid "Converting input files to PostScript"
+msgstr "将输入文件转换为 PostScript"
+
+#: faxctrl.cpp:462
+msgid "Sending fax to %1 (%2)"
+msgstr "发送传真给 %1 (%2)"
+
+#: faxctrl.cpp:467
+#, c-format
+msgid "Sending to fax using: %1"
+msgstr "发送到传真使用:%1"
+
+#: faxctrl.cpp:471
+msgid "Sending fax to %1..."
+msgstr "正在发送传真到 %1..."
+
+#: faxctrl.cpp:482
+msgid "Skipping %1..."
+msgstr "正在跳过 %1..."
+
+#: faxctrl.cpp:500
+msgid "Filtering %1..."
+msgstr "正在过滤 %1..."
+
+#: faxctrl.cpp:618
+msgid "Fax log"
+msgstr "传真日志"
+
+#: faxctrl.cpp:620
+msgid "Fax Log"
+msgstr "传真日志"
+
+#: faxctrl.cpp:629 faxctrl.cpp:659
+msgid "TDEPrint Fax Tool Log"
+msgstr "TDEPrint 传真工具日志"
+
+#: faxctrl.cpp:664
+msgid "Cannot open file for writing."
+msgstr "无法打开文件进行写入。"
+
+#: faxab.cpp:44
+msgid "Entries:"
+msgstr "项目:"
+
+#: faxab.cpp:47
+msgid "&Edit Addressbook"
+msgstr "编辑地址薄(&E)"
+
+#: faxab.cpp:150
+msgid "No fax number found in your address book."
+msgstr "在您的地址薄中没有找到传真号码。"
+
+#: filterdlg.cpp:31
+msgid "Filter Parameters"
+msgstr "过滤器参数"
+
+#: filterdlg.cpp:37
+msgid "MIME type:"
+msgstr "MIME 类型:"
+
+#: filterdlg.cpp:38
+msgid "Command:"
+msgstr "命令:"
+
+#. i18n: file tdeprintfaxui.rc line 10
+#: rc.cpp:6
+#, no-c-format
+msgid "Fa&x"
+msgstr "传真(&X)"
+
+#: confsystem.cpp:50
+msgid "F&ax system:"
+msgstr "传真系统(&A):"
+
+#: confsystem.cpp:51
+msgid "Co&mmand:"
+msgstr "命令(&M):"
+
+#: confsystem.cpp:61
+msgid "Fax &server (if any):"
+msgstr "传真服务器(如果存在)(&S):"
+
+#: confsystem.cpp:62
+msgid "&Fax/Modem device:"
+msgstr "传真/调制解调器设备(&F):"
+
+#: confsystem.cpp:65
+msgid "Standard Modem Port"
+msgstr "标准调制解调器端口"
+
+#: confsystem.cpp:67
+#, c-format
+msgid "Serial Port #%1"
+msgstr "串口 #%1"
+
+#: confsystem.cpp:68
+msgid "Other"
+msgstr "其它"
+
+#: main.cpp:33
+msgid "A small fax utility to be used with tdeprint."
+msgstr "一个小传真实用工具和tdeprint一起使用。"
+
+#: main.cpp:39
+msgid "Phone number to fax to"
+msgstr "要发送传真的电话号码"
+
+#: main.cpp:40
+msgid "Send fax immediately"
+msgstr "立即发送传真"
+
+#: main.cpp:41
+msgid "Exit after sending"
+msgstr "发送后退出"
+
+#: main.cpp:42
+msgid "File to fax (added to the file list)"
+msgstr "要传真的文件(加进文件列表)"
+
+#: main.cpp:50
+#, fuzzy
+msgid "TDEPrintFax"
+msgstr "TDEPrint 传真工具日志"
+
+#~ msgid "KdeprintFax"
+#~ msgstr "KdeprintFax"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tderandr.po b/tde-i18n-zh_CN/messages/tdebase/tderandr.po
index 4c388912e2c..a57f9f68fb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tderandr.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tderandr.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tderandr\n"
-"POT-Creation-Date: 2006-11-08 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-01-12 14:31+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +26,50 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: tderandrmodule.cpp:82
+#: configdialog.cpp:49
+msgid "Global &Shortcuts"
+msgstr ""
+
+#: ktimerdialog.cpp:154
+#, c-format
+msgid ""
+"_n: 1 second remaining:\n"
+"%n seconds remaining:"
+msgstr "还剩 %n 秒:"
+
+#: main.cpp:32
+msgid "Application is being auto-started at TDE session start"
+msgstr "应用程序会在 TDE 会话启动时自动启动"
+
+#: main.cpp:38
+msgid "Resize and Rotate"
+msgstr "大小和旋转"
+
+#: main.cpp:38
+msgid "Resize and Rotate System Tray App"
+msgstr "大小和旋转系统托盘小程序"
+
+#: main.cpp:39
+msgid "Developer and maintainer"
+msgstr ""
+
+#: main.cpp:40
+msgid "Original developer and maintainer"
+msgstr ""
+
+#: main.cpp:41
+msgid "Many fixes"
+msgstr "许多改正"
+
+#: tderandrbindings.cpp:29
+msgid "Display Control"
+msgstr ""
+
+#: tderandrbindings.cpp:31
+msgid "Switch Displays"
+msgstr ""
+
+#: tderandrmodule.cpp:83
msgid ""
"<qt>Your X server does not support resizing and rotating the display. Please "
"update to version 4.3 or greater. You need the X Resize And Rotate extension "
@@ -34,239 +78,274 @@ msgstr ""
"<qt>您的 X 服务器不支持对显示大小的更改以及旋转。请更新到 4.3 或更高版本。要使用此特性,您还需要 X 更改大小和旋转扩展(RANDR) 1.1 "
"或更高版本。</qt>"
-#: tderandrmodule.cpp:91
+#: tderandrmodule.cpp:92
msgid "Settings for screen:"
msgstr "屏幕设置:"
-#: tderandrmodule.cpp:95 tderandrtray.cpp:83
+#: tderandrmodule.cpp:96 tderandrtray.cpp:267
#, c-format
msgid "Screen %1"
msgstr "屏幕 %1"
-#: tderandrmodule.cpp:100
+#: tderandrmodule.cpp:101
msgid ""
"The screen whose settings you would like to change can be selected using this "
"drop-down list."
msgstr "您想要对进行的全部设置都可使用此下拉列表选择。"
-#: tderandrmodule.cpp:109
+#: tderandrmodule.cpp:110
msgid "Screen size:"
msgstr "屏幕大小:"
-#: tderandrmodule.cpp:111
+#: tderandrmodule.cpp:112
msgid ""
"The size, otherwise known as the resolution, of your screen can be selected "
"from this drop-down list."
msgstr "您可从此下拉列表中选择屏幕的大小,或称分辨率。"
-#: tderandrmodule.cpp:117
+#: tderandrmodule.cpp:118
msgid "Refresh rate:"
msgstr "刷新率:"
-#: tderandrmodule.cpp:119
+#: tderandrmodule.cpp:120
msgid ""
"The refresh rate of your screen can be selected from this drop-down list."
msgstr "您可从此下拉列表中选择您屏幕的刷新率。"
-#: tderandrmodule.cpp:123
+#: tderandrmodule.cpp:124
msgid "Orientation (degrees counterclockwise)"
msgstr "方向(逆时针角度)"
-#: tderandrmodule.cpp:126
+#: tderandrmodule.cpp:127
msgid ""
"The options in this section allow you to change the rotation of your screen."
msgstr "本节中的选项允许您更改屏幕的旋转。"
-#: tderandrmodule.cpp:128
+#: tderandrmodule.cpp:129
msgid "Apply settings on TDE startup"
msgstr "在 TDE 启动时应用设置"
-#: tderandrmodule.cpp:130
+#: tderandrmodule.cpp:131
msgid ""
"If this option is enabled the size and orientation settings will be used when "
"TDE starts."
msgstr "如果启用了此选项,将会在 TDE 启动时使用大小和方向设置。"
-#: tderandrmodule.cpp:135
+#: tderandrmodule.cpp:136
msgid "Allow tray application to change startup settings"
msgstr "允许托盘应用程序更改启动设置"
-#: tderandrmodule.cpp:137
+#: tderandrmodule.cpp:138
msgid ""
"If this option is enabled, options set by the system tray applet will be saved "
"and loaded when TDE starts instead of being temporary."
msgstr "如果启用了此选项,系统托盘小程序所设定的选项将会被保存,并在 TDE 启动时装入,而不仅仅是临时设置。"
-#: tderandrmodule.cpp:174 tderandrtray.cpp:149
+#: tderandrmodule.cpp:175 tderandrtray.cpp:433
msgid "%1 x %2"
msgstr "%1 x %2"
-#: tderandrtray.cpp:45
+#: tderandrtray.cpp:62
msgid "Screen resize & rotate"
msgstr "屏幕大小和旋转"
-#: tderandrtray.cpp:69
+#: tderandrtray.cpp:107
+msgid "Start KRandRTray automatically when you log in?"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Question"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Start Automatically"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Do Not Start"
+msgstr ""
+
+#: tderandrtray.cpp:252
msgid "Required X Extension Not Available"
msgstr "所需的 X 扩展不可用"
-#: tderandrtray.cpp:94
-msgid "Configure Display..."
+#: tderandrtray.cpp:282
+msgid "Color Profile"
+msgstr ""
+
+#: tderandrtray.cpp:298
+msgid "Display Profiles"
+msgstr ""
+
+#: tderandrtray.cpp:308
+#, fuzzy
+msgid "Global Configuration"
+msgstr "接受配置(&A)"
+
+#: tderandrtray.cpp:310
+#, fuzzy
+msgid "Configure Displays..."
+msgstr "配置显示..."
+
+#: tderandrtray.cpp:320
+#, fuzzy
+msgid "Configure Shortcut Keys..."
msgstr "配置显示..."
-#: tderandrtray.cpp:117
+#: tderandrtray.cpp:355
msgid "Screen configuration has changed"
msgstr "屏幕配置已更改"
-#: tderandrtray.cpp:128
+#: tderandrtray.cpp:412
msgid "Screen Size"
msgstr "屏幕大小"
-#: tderandrtray.cpp:181
+#: tderandrtray.cpp:465
msgid "Refresh Rate"
msgstr "刷新率"
-#: tderandrtray.cpp:251
+#: tderandrtray.cpp:539
msgid "Configure Display"
msgstr "配置显示"
-#: ktimerdialog.cpp:154
-#, c-format
-msgid ""
-"_n: 1 second remaining:\n"
-"%n seconds remaining:"
-msgstr "还剩 %n 秒:"
-
-#: main.cpp:32
-msgid "Application is being auto-started at TDE session start"
-msgstr "应用程序会在 TDE 会话启动时自动启动"
+#: tderandrtray.cpp:548
+#, fuzzy
+msgid "Configure Displays"
+msgstr "配置显示"
-#: main.cpp:38
-msgid "Resize and Rotate"
-msgstr "大小和旋转"
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
+msgid ""
+"<b>Unable to activate output %1</b>"
+"<p>Either the output is not connected to a display,"
+"<br>or the display configuration is not detectable"
+msgstr ""
-#: main.cpp:38
-msgid "Resize and Rotate System Tray App"
-msgstr "大小和旋转系统托盘小程序"
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
+msgid "Output Unavailable"
+msgstr ""
-#: main.cpp:39
-msgid "Maintainer"
-msgstr "维护者"
+#: tderandrtray.cpp:744
+msgid "Output Port"
+msgstr ""
-#: main.cpp:40
-msgid "Many fixes"
-msgstr "许多改正"
+#: tderandrtray.cpp:759
+msgid "%1 (Active)"
+msgstr ""
-#: randr.cpp:159
-msgid "Confirm Display Setting Change"
-msgstr "确认显示设置更改"
+#: tderandrtray.cpp:781
+msgid "%1 (Connected, Inactive)"
+msgstr ""
-#: randr.cpp:163
-msgid "&Accept Configuration"
-msgstr "接受配置(&A)"
+#: tderandrtray.cpp:803
+msgid "%1 (Disconnected, Inactive)"
+msgstr ""
-#: randr.cpp:164
-msgid "&Return to Previous Configuration"
-msgstr "返回到先前配置(&R)"
+#: tderandrtray.cpp:810
+msgid "Next available output"
+msgstr ""
-#: randr.cpp:166
+#: tderandrtray.cpp:883
msgid ""
-"Your screen orientation, size and refresh rate have been changed to the "
-"requested settings. Please indicate whether you wish to keep this "
-"configuration. In 15 seconds the display will revert to your previous settings."
-msgstr "您的屏幕方向、大小和刷新率已经更改为所设定的值。请确定您是否要保持此配置。如果您没有任何操作的话,15 秒后显示将会返回到您先前的设置。"
+"<b>You are attempting to deactivate the only active output</b>"
+"<p>You must keep at least one display output active at all times!"
+msgstr ""
-#: randr.cpp:197
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3"
+#: tderandrtray.cpp:883
+msgid "Invalid Operation Requested"
msgstr ""
-"新配置:\n"
-"分辨率:%1 x %2\n"
-"方向:%3"
-#: randr.cpp:202
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3\n"
-"Refresh rate: %4"
+#: tderandrtray.cpp:891
+msgid "New display output options are available!"
+msgstr ""
+
+#: tderandrtray.cpp:892
+msgid "A screen has been added, removed, or changed"
msgstr ""
-"新配置:\n"
-"分辨率:%1 x %2\n"
-"方向:%3\n"
-"刷新率:%4"
-#: randr.cpp:231 randr.cpp:248
-msgid "Normal"
-msgstr "普通"
+#~ msgid "Maintainer"
+#~ msgstr "维护者"
-#: randr.cpp:233
-msgid "Left (90 degrees)"
-msgstr "左(90度)"
+#~ msgid "Confirm Display Setting Change"
+#~ msgstr "确认显示设置更改"
-#: randr.cpp:235
-msgid "Upside-down (180 degrees)"
-msgstr "上下颠倒(180度)"
+#~ msgid "&Return to Previous Configuration"
+#~ msgstr "返回到先前配置(&R)"
-#: randr.cpp:237
-msgid "Right (270 degrees)"
-msgstr "右(270度)"
+#~ msgid "Your screen orientation, size and refresh rate have been changed to the requested settings. Please indicate whether you wish to keep this configuration. In 15 seconds the display will revert to your previous settings."
+#~ msgstr "您的屏幕方向、大小和刷新率已经更改为所设定的值。请确定您是否要保持此配置。如果您没有任何操作的话,15 秒后显示将会返回到您先前的设置。"
-#: randr.cpp:239
-msgid "Mirror horizontally"
-msgstr "水平镜像"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3"
+#~ msgstr ""
+#~ "新配置:\n"
+#~ "分辨率:%1 x %2\n"
+#~ "方向:%3"
-#: randr.cpp:241
-msgid "Mirror vertically"
-msgstr "垂直镜像"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3\n"
+#~ "Refresh rate: %4"
+#~ msgstr ""
+#~ "新配置:\n"
+#~ "分辨率:%1 x %2\n"
+#~ "方向:%3\n"
+#~ "刷新率:%4"
-#: randr.cpp:243 randr.cpp:274
-msgid "Unknown orientation"
-msgstr "未知方向"
+#~ msgid "Normal"
+#~ msgstr "普通"
-#: randr.cpp:250
-msgid "Rotated 90 degrees counterclockwise"
-msgstr "逆时针旋转 90 度"
+#~ msgid "Left (90 degrees)"
+#~ msgstr "左(90度)"
-#: randr.cpp:252
-msgid "Rotated 180 degrees counterclockwise"
-msgstr "逆时针旋转 180 度"
+#~ msgid "Upside-down (180 degrees)"
+#~ msgstr "上下颠倒(180度)"
-#: randr.cpp:254
-msgid "Rotated 270 degrees counterclockwise"
-msgstr "逆时针旋转 270 度"
+#~ msgid "Right (270 degrees)"
+#~ msgstr "右(270度)"
-#: randr.cpp:259
-msgid "Mirrored horizontally and vertically"
-msgstr "水平垂直镜像"
+#~ msgid "Mirror horizontally"
+#~ msgstr "水平镜像"
-#: randr.cpp:261
-msgid "mirrored horizontally and vertically"
-msgstr "水平垂直镜像"
+#~ msgid "Mirror vertically"
+#~ msgstr "垂直镜像"
-#: randr.cpp:264
-msgid "Mirrored horizontally"
-msgstr "水平镜像"
+#~ msgid "Unknown orientation"
+#~ msgstr "未知方向"
-#: randr.cpp:266
-msgid "mirrored horizontally"
-msgstr "水平镜像"
+#~ msgid "Rotated 90 degrees counterclockwise"
+#~ msgstr "逆时针旋转 90 度"
-#: randr.cpp:269
-msgid "Mirrored vertically"
-msgstr "垂直镜像"
+#~ msgid "Rotated 180 degrees counterclockwise"
+#~ msgstr "逆时针旋转 180 度"
-#: randr.cpp:271
-msgid "mirrored vertically"
-msgstr "垂直镜像"
+#~ msgid "Rotated 270 degrees counterclockwise"
+#~ msgstr "逆时针旋转 270 度"
-#: randr.cpp:276
-msgid "unknown orientation"
-msgstr "未知方向"
+#~ msgid "Mirrored horizontally and vertically"
+#~ msgstr "水平垂直镜像"
-#: randr.cpp:400 randr.cpp:405
-msgid ""
-"_: Refresh rate in Hertz (Hz)\n"
-"%1 Hz"
-msgstr "%1 Hz"
+#~ msgid "mirrored horizontally and vertically"
+#~ msgstr "水平垂直镜像"
+
+#~ msgid "Mirrored horizontally"
+#~ msgstr "水平镜像"
+
+#~ msgid "mirrored horizontally"
+#~ msgstr "水平镜像"
+
+#~ msgid "Mirrored vertically"
+#~ msgstr "垂直镜像"
+
+#~ msgid "mirrored vertically"
+#~ msgstr "垂直镜像"
+
+#~ msgid "unknown orientation"
+#~ msgstr "未知方向"
+
+#~ msgid ""
+#~ "_: Refresh rate in Hertz (Hz)\n"
+#~ "%1 Hz"
+#~ msgstr "%1 Hz"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po b/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
index 1aa2939ac59..e804eaa7660 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdescreensaver\n"
-"POT-Creation-Date: 2007-01-26 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-12-28 14:06+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgstr "设置空屏幕屏保"
msgid "Color:"
msgstr "颜色:"
-#: random.cpp:41
+#: random.cpp:42
msgid ""
"Usage: %1 [-setup] [args]\n"
"Starts a random screen saver.\n"
@@ -37,34 +38,34 @@ msgstr ""
"随机运行一个屏幕保护程序。\n"
"任何参数(除了 -setup)都将传递给屏幕保护程序。"
-#: random.cpp:48
+#: random.cpp:49
msgid "Start a random TDE screen saver"
msgstr "启动随机的 TDE 屏幕保护程序"
-#: random.cpp:54
+#: random.cpp:55
msgid "Setup screen saver"
msgstr "设置屏幕保护程序"
-#: random.cpp:55
+#: random.cpp:56
msgid "Run in the specified XWindow"
msgstr "在指定的 XWindow 中运行"
-#: random.cpp:56
+#: random.cpp:57
msgid "Run in the root XWindow"
msgstr "在 root XWindow 中运行"
-#: random.cpp:66
+#: random.cpp:104
msgid "Random screen saver"
msgstr "随机屏幕保护程序"
-#: random.cpp:215
+#: random.cpp:261
msgid "Setup Random Screen Saver"
msgstr "设置随机屏幕保护程序"
-#: random.cpp:222
+#: random.cpp:268
msgid "Use OpenGL screen savers"
msgstr "使用 OpenGL 屏幕保护程序"
-#: random.cpp:225
+#: random.cpp:271
msgid "Use screen savers that manipulate the screen"
msgstr "使用变换屏幕的屏幕保护程序"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po b/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
index 14119b85485..a7389f8880e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdestyle_keramik_config\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2003-11-11 17:17+0800\n"
"Last-Translator: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdesu.po b/tde-i18n-zh_CN/messages/tdebase/tdesu.po
index c22531f570d..75b69f3faf9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdesu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdesu.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdesu\n"
-"POT-Creation-Date: 2007-11-14 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2004-06-22 12:56+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -51,61 +52,67 @@ msgid "Let command use existing dcopserver"
msgstr "让命令使用已有的 dcopserver"
#: tdesu.cpp:66
-msgid "Do not display ignore button"
-msgstr "不显示忽略按钮"
+#, fuzzy
+msgid "Ignored"
+msgstr "忽略(&I)"
#: tdesu.cpp:67
+#, fuzzy
+msgid "Display the ignore button"
+msgstr "不显示忽略按钮"
+
+#: tdesu.cpp:68
msgid "Specify icon to use in the password dialog"
msgstr "指定要在密码对话框中使用的图标"
-#: tdesu.cpp:68
+#: tdesu.cpp:69
msgid "Do not show the command to be run in the dialog"
msgstr "不在对话框中显示要运行的命令"
-#: tdesu.cpp:99
+#: tdesu.cpp:100
msgid "TDE su"
msgstr "TDE su"
-#: tdesu.cpp:100
+#: tdesu.cpp:101
msgid "Runs a program with elevated privileges."
msgstr "用提升的权限来运行程序。"
-#: tdesu.cpp:103
+#: tdesu.cpp:104
msgid "Maintainer"
msgstr "维护者"
-#: tdesu.cpp:105
+#: tdesu.cpp:106
msgid "Original author"
msgstr "初始作者"
-#: tdesu.cpp:131
+#: tdesu.cpp:132
msgid "Command '%1' not found."
msgstr "找不到命令“%1”。"
-#: tdesu.cpp:207
+#: tdesu.cpp:208
#, c-format
msgid "Illegal priority: %1"
msgstr "不合法的优先级:%1"
-#: tdesu.cpp:235
+#: tdesu.cpp:230
msgid "No command specified."
msgstr "没有指定命令。"
-#: tdesu.cpp:344
+#: tdesu.cpp:336
msgid ""
"Su returned with an error.\n"
msgstr ""
"Su 返回错误。\n"
-#: tdesu.cpp:365
+#: tdesu.cpp:357
msgid "Command:"
msgstr "命令:"
-#: tdesu.cpp:370
+#: tdesu.cpp:362
msgid "realtime: "
msgstr "实时:"
-#: tdesu.cpp:373
+#: tdesu.cpp:365
msgid "Priority:"
msgstr "优先级:"
@@ -118,27 +125,48 @@ msgstr "以 %1 运行"
msgid "Please enter your password."
msgstr "请输入您的密码。"
-#: sudlg.cpp:36
+#: sudlg.cpp:37
msgid ""
"The action you requested needs root privileges. Please enter root's password "
"below or click Ignore to continue with your current privileges."
msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码或按忽略按钮来使用当前的权限来继续。"
-#: sudlg.cpp:40
+#: sudlg.cpp:42
msgid ""
"The action you requested needs additional privileges. Please enter the password "
"for \"%1\" below or click Ignore to continue with your current privileges."
msgstr "您请求的动作需要额外的权限。请在下面输入“%1”的密码或忽略按钮来使用当前的权限来继续。"
-#: sudlg.cpp:48
+#: sudlg.cpp:49
+#, fuzzy
+msgid ""
+"The action you requested needs root privileges. Please enter root's password "
+"below."
+msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
+
+#: sudlg.cpp:53
+#, fuzzy
+msgid ""
+"The action you requested needs additional privileges. Please enter the password "
+"for \"%1\" below."
+msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
+
+#: sudlg.cpp:59
+msgid ""
+"<qt>The stored password will be:"
+"<br> * Kept for up to %1 minutes"
+"<br> * Destroyed on logout"
+msgstr ""
+
+#: sudlg.cpp:62
msgid "&Ignore"
msgstr "忽略(&I)"
-#: sudlg.cpp:64
+#: sudlg.cpp:78
msgid "Conversation with su failed."
msgstr "和 su 的通信失败。"
-#: sudlg.cpp:73
+#: sudlg.cpp:87
msgid ""
"The program 'su' is not found;\n"
"make sure your PATH is set correctly."
@@ -146,7 +174,7 @@ msgstr ""
"没有找到程序“su”。\n"
"请确定您的 PATH 设置正确。"
-#: sudlg.cpp:80
+#: sudlg.cpp:94
msgid ""
"You are not allowed to use 'su';\n"
"on some systems, you need to be in a special group (often: wheel) to use this "
@@ -155,11 +183,11 @@ msgstr ""
"您不被允许使用“su”。\n"
"在某些系统上,您需要在特别的组群里(通常是 wheel)来使用这个命令。"
-#: sudlg.cpp:87
+#: sudlg.cpp:101
msgid "Incorrect password; please try again."
msgstr "不正确的密码;请重试。"
-#: sudlg.cpp:91
+#: sudlg.cpp:105
msgid "Internal error: illegal return from SuProcess::checkInstall()"
msgstr "内部错误:不合法的返回值来自 SuProcess::checkInstall()"
@@ -174,6 +202,3 @@ msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr "lark@linux.net.cn"
-
-#~ msgid "The action you requested needs root privileges. Please enter root's password below "
-#~ msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdesud.po b/tde-i18n-zh_CN/messages/tdebase/tdesud.po
index 54c31dca325..229cfd3c522 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdesud.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdesud.po
@@ -6,24 +6,25 @@
msgid ""
msgstr ""
"Project-Id-Version: tdesud\n"
-"POT-Creation-Date: 2005-07-23 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2001-02-08 14:00+0800\n"
"Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
-#: tdesud.cpp:251
+#: tdesud.cpp:254
msgid "TDE su daemon"
msgstr "TDE su 守护程序"
-#: tdesud.cpp:252
+#: tdesud.cpp:255
msgid "Daemon used by tdesu"
msgstr "tdesu所使用的守护程序"
-#: tdesud.cpp:255
+#: tdesud.cpp:258
msgid "Author"
msgstr "作者"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po b/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
index 6d18a1b6acc..f86fef4f935 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2007-11-17 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-24 01:54+0800\n"
"Last-Translator: redarmy <redarmy@linuxaid.com.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,11 +29,11 @@ msgstr ""
"如果选中此选项,TDM 将为背景使用下面的设置。如果禁用的话,您必须自己处理背景。自己设置背景可以在 tdmrc 中的 Setup= "
"选项指定的脚本中运行某些程序(可能是 xsetroot)。"
-#: tdm-appear.cpp:71
+#: tdm-appear.cpp:77
msgid "&Greeting:"
msgstr "欢迎辞(&G):"
-#: tdm-appear.cpp:76
+#: tdm-appear.cpp:82
msgid ""
"This is the \"headline\" for TDM's login window. You may want to put some nice "
"greeting or information about the operating system here."
@@ -60,117 +61,156 @@ msgstr ""
"<li>%m -> 机器(硬件)类型</li>"
"<li>%% -> 百分号自身</li></ul>"
-#: tdm-appear.cpp:95
+#: tdm-appear.cpp:101
msgid "Logo area:"
msgstr "标志区域:"
-#: tdm-appear.cpp:99
+#: tdm-appear.cpp:105
msgid ""
"_: logo area\n"
"&None"
msgstr "无(&N)"
-#: tdm-appear.cpp:100
+#: tdm-appear.cpp:106
msgid "Show cloc&k"
msgstr "显示时钟(&K)"
-#: tdm-appear.cpp:101
+#: tdm-appear.cpp:107
msgid "Sho&w logo"
msgstr "显示标志(&W)"
-#: tdm-appear.cpp:113
+#: tdm-appear.cpp:119
msgid ""
"You can choose to display a custom logo (see below), a clock or no logo at all."
msgstr "您可以选择显示自定义的标志(见下面)、时钟或什么都没有。"
-#: tdm-appear.cpp:119
+#: tdm-appear.cpp:125
msgid "&Logo:"
msgstr "标志(&L):"
-#: tdm-appear.cpp:129
+#: tdm-appear.cpp:135
msgid ""
"Click here to choose an image that TDM will display. You can also drag and drop "
"an image onto this button (e.g. from Konqueror)."
msgstr "单击这里选择 TDM 将显示的图像。您可以将图像拖放到这个按钮上(例如从 Konqeuror)。"
-#: tdm-appear.cpp:141
+#: tdm-appear.cpp:147
msgid "Position:"
msgstr "位置:"
-#: tdm-appear.cpp:144
+#: tdm-appear.cpp:150
msgid "&X:"
msgstr "&X:"
-#: tdm-appear.cpp:151
+#: tdm-appear.cpp:157
msgid "&Y:"
msgstr "&Y:"
-#: tdm-appear.cpp:158
+#: tdm-appear.cpp:164
msgid ""
"Here you specify the relative coordinates (in percent) of the login dialog's "
"<em>center</em>."
msgstr "您可以在此这里指定登录对话框<em>中心</em>的相对坐标(百分比)。"
-#: tdm-appear.cpp:173 tdm-appear.cpp:186 tdm-users.cpp:84
+#: tdm-appear.cpp:179
+msgid "None"
+msgstr ""
+
+#: tdm-appear.cpp:180
+msgid "Trinity compositor"
+msgstr ""
+
+#: tdm-appear.cpp:181
+#, fuzzy
+msgid "Compositor:"
+msgstr "位置:"
+
+#: tdm-appear.cpp:185
+msgid ""
+"Choose a compositor to be used in TDM. Note that the chosen compositor will "
+"continue to run after login."
+msgstr ""
+
+#: tdm-appear.cpp:190 tdm-appear.cpp:203 tdm-users.cpp:84
msgid "<default>"
msgstr "<默认>"
-#: tdm-appear.cpp:176
+#: tdm-appear.cpp:193
msgid "GUI s&tyle:"
msgstr "GUI 风格(&T):"
-#: tdm-appear.cpp:180
+#: tdm-appear.cpp:197
msgid "You can choose a basic GUI style here that will be used by TDM only."
msgstr "您可以选择仅被 TDM 使用的基本的图形用户界面风格。"
-#: tdm-appear.cpp:189
+#: tdm-appear.cpp:206
msgid "&Color scheme:"
msgstr "配色方案(&C):"
-#: tdm-appear.cpp:193
+#: tdm-appear.cpp:210
msgid "You can choose a basic Color Scheme here that will be used by TDM only."
msgstr "您可以选择仅被 TDM 使用的基本的配色方案。"
-#: tdm-appear.cpp:199
+#: tdm-appear.cpp:216
msgid "No Echo"
msgstr "不回显"
-#: tdm-appear.cpp:200
+#: tdm-appear.cpp:217
msgid "One Star"
msgstr "一个星号"
-#: tdm-appear.cpp:201
+#: tdm-appear.cpp:218
msgid "Three Stars"
msgstr "三个星号"
-#: tdm-appear.cpp:202
+#: tdm-appear.cpp:219
msgid "Echo &mode:"
msgstr "回显模式(&M):"
-#: tdm-appear.cpp:206
+#: tdm-appear.cpp:223
msgid ""
"You can choose whether and how TDM shows your password when you type it."
msgstr "您可以选择 TDM 是否和怎样显示您输入的密码。"
-#: tdm-appear.cpp:212
+#: tdm-appear.cpp:229
msgid "Locale"
msgstr "语系"
-#: tdm-appear.cpp:218
+#: tdm-appear.cpp:235
msgid "Languag&e:"
msgstr "语言(&E):"
-#: tdm-appear.cpp:223
+#: tdm-appear.cpp:240
msgid ""
"Here you can choose the language used by TDM. This setting does not affect a "
"user's personal settings; that will take effect after login."
msgstr "您可以在此选择 TDM 使用的语言。此设置不会影响在登录后生效的用户的个人设置。"
-#: tdm-appear.cpp:264
+#: tdm-appear.cpp:247
+msgid "Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:250
+msgid "Enable Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:258
+msgid ""
+"Secure Attention Key support is not available on your system. Please check for "
+"the presence of evdev and uinput."
+msgstr ""
+
+#: tdm-appear.cpp:262
+msgid ""
+"Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing "
+"measure."
+msgstr ""
+
+#: tdm-appear.cpp:303
msgid "without name"
msgstr "没有名称"
-#: tdm-appear.cpp:405
+#: tdm-appear.cpp:444
msgid ""
"There was an error loading the image:\n"
"%1\n"
@@ -180,12 +220,12 @@ msgstr ""
"%1\n"
"它不会被保存。"
-#: tdm-appear.cpp:445 tdm-appear.cpp:488
-#, c-format
-msgid "Welcome to %s at %n"
+#: tdm-appear.cpp:506 tdm-appear.cpp:561
+#, fuzzy, c-format
+msgid "Welcome to %n"
msgstr "欢迎访问 %s %n"
-#: tdm-appear.cpp:504
+#: tdm-appear.cpp:578
msgid ""
"<h1>TDM - Appearance</h1> Here you can configure the basic appearance of the "
"TDM login manager, i.e. a greeting string, an icon etc."
@@ -232,31 +272,31 @@ msgid ""
"antialiased (smoothed) in the login dialog."
msgstr "如果您使用该选项,且您的 X 服务器支持 Xft 扩展,在登录对话框中将使用平滑字体。"
-#: tdm-shut.cpp:49
+#: tdm-shut.cpp:48
msgid "Allow Shutdown"
msgstr "允许关机"
-#: tdm-shut.cpp:52
+#: tdm-shut.cpp:51
msgid "&Local:"
msgstr "本地(&L):"
-#: tdm-shut.cpp:53 tdm-shut.cpp:59
+#: tdm-shut.cpp:52 tdm-shut.cpp:58
msgid "Everybody"
msgstr "任何人"
-#: tdm-shut.cpp:54 tdm-shut.cpp:60
+#: tdm-shut.cpp:53 tdm-shut.cpp:59
msgid "Only Root"
msgstr "仅 Root"
-#: tdm-shut.cpp:55 tdm-shut.cpp:61
+#: tdm-shut.cpp:54 tdm-shut.cpp:60
msgid "Nobody"
msgstr "无人"
-#: tdm-shut.cpp:58
+#: tdm-shut.cpp:57
msgid "&Remote:"
msgstr "远程(&R):"
-#: tdm-shut.cpp:63
+#: tdm-shut.cpp:62
msgid ""
"Here you can select who is allowed to shutdown the computer using TDM. You can "
"specify different values for local (console) and remote displays. Possible "
@@ -273,48 +313,60 @@ msgstr ""
"<li><em>仅 root:</em>TDM 只有在用户输入 root 用户密码后才允许关机</li>"
"<li><em>无人:</em>没有人能够使用 TDM 来关机</li></ul>"
-#: tdm-shut.cpp:71
+#: tdm-shut.cpp:70
msgid "Commands"
msgstr "命令"
-#: tdm-shut.cpp:74
+#: tdm-shut.cpp:73
msgid "H&alt:"
msgstr "关闭系统(&A):"
-#: tdm-shut.cpp:77
+#: tdm-shut.cpp:76
msgid "Command to initiate the system halt. Typical value: /sbin/halt"
msgstr "关机的命令。一般在:/sbin/halt"
-#: tdm-shut.cpp:82
+#: tdm-shut.cpp:81
msgid "Reb&oot:"
msgstr "重新启动(&O):"
-#: tdm-shut.cpp:85
+#: tdm-shut.cpp:84
msgid "Command to initiate the system reboot. Typical value: /sbin/reboot"
msgstr "系统重新启动的命令。一般在:/sbin/reboot"
-#: tdm-shut.cpp:93
+#: tdm-shut.cpp:92
msgid ""
"_: boot manager\n"
"None"
msgstr "无"
-#: tdm-shut.cpp:94
+#: tdm-shut.cpp:93
msgid "Grub"
msgstr "Grub"
-#: tdm-shut.cpp:96
+#: tdm-shut.cpp:95
msgid "Lilo"
msgstr "Lilo"
-#: tdm-shut.cpp:98
+#: tdm-shut.cpp:97
msgid "Boot manager:"
msgstr "启动管理器:"
-#: tdm-shut.cpp:100
+#: tdm-shut.cpp:99
msgid "Enable boot options in the \"Shutdown...\" dialog."
msgstr "在“关机...”对话框里启用启动选项。"
+#: tdm-shut.cpp:103
+msgid "Restart X-Server with session exit"
+msgstr ""
+
+#: tdm-shut.cpp:105
+msgid ""
+"Whether the login manager should restart the local X-Server after a session "
+"exit instead of resetting. Use this option when the X-Server leaks memory, "
+"crashes the system on reset attempts, or otherwise exhibits display issues or "
+"artifacts."
+msgstr ""
+
#: tdm-users.cpp:81
#, c-format
msgid "Unable to create folder %1"
@@ -663,6 +715,16 @@ msgstr ""
"当该选项打开时,当会话因为 X 服务器崩溃而中断后,用户将自动登录;注意,这个选项可能导致安全漏洞:如果你使用另外的屏幕锁定程序,而不是 TDE "
"集成的,这个选项使绕过密码保护的屏幕锁定程序成为可能。"
+#: tdm-conv.cpp:157
+msgid "Allow &Root Login"
+msgstr ""
+
+#: tdm-conv.cpp:158
+msgid ""
+"When set this allows root logins directly in TDM. This is discouraged by some "
+"people. Use with caution."
+msgstr ""
+
#: main.cpp:67
msgid ""
"%1 does not appear to be an image file.\n"
@@ -731,27 +793,27 @@ msgstr ""
"<h2>便利</h2>您可以指定以某个用户身份自动登录,用户不需要输入密码即可登录;还有其它为懒人准备的其它特性。 "
"<br>注意,这些设置从根本上说是安全漏洞,所以请小心使用。"
-#: main.cpp:186
+#: main.cpp:192
msgid "A&ppearance"
msgstr "外观(&P)"
-#: main.cpp:190
+#: main.cpp:196
msgid "&Font"
msgstr "字体(&F)"
-#: main.cpp:194
+#: main.cpp:200
msgid "&Background"
msgstr "背景(&B)"
-#: main.cpp:198
+#: main.cpp:204
msgid "&Shutdown"
msgstr "关机(&S)"
-#: main.cpp:202
+#: main.cpp:208
msgid "&Users"
msgstr "用户(&U)"
-#: main.cpp:210
+#: main.cpp:216
msgid "Con&venience"
msgstr "便利(&V)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
index f3864855cb9..9c693169882 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
@@ -8,113 +8,30 @@
msgid ""
msgstr ""
"Project-Id-Version: tdmgreet\n"
-"POT-Creation-Date: 2007-12-08 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-01 02:06+0800\n"
"Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
"X-Generator: KBabel 1.3\n"
-#: tdmconfig.cpp:139
-msgid "[fix tdmrc!]"
-msgstr "[修补 tdmrc!]"
-
-#: tdmconfig.cpp:154
-msgid ""
-"_n: %1: TTY login\n"
-"%1: %n TTY logins"
-msgstr "%1:%n 次 TTY 登录"
-
-#: tdmconfig.cpp:165
-msgid "Unused"
-msgstr "未用"
-
-#: tdmconfig.cpp:167
-msgid ""
-"_: user: session type\n"
-"%1: %2"
-msgstr "%1:%2"
-
-#: tdmconfig.cpp:169
-#, c-format
-msgid ""
-"_: ... host\n"
-"X login on %1"
-msgstr "%1 上的 X 登录"
-
-#: krootimage.cpp:37
-msgid "Fancy desktop background for tdm"
-msgstr "tdm 的梦幻桌面背景"
-
-#: krootimage.cpp:42
-msgid "Name of the configuration file"
-msgstr "配置文件名称"
-
-#: krootimage.cpp:103
-msgid "KRootImage"
-msgstr "KRootImage"
-
-#: kchooser.cpp:57
-msgid "&Local Login"
-msgstr "本地登录(&L)"
-
-#: kchooser.cpp:61
-msgid "XDMCP Host Menu"
-msgstr "XDMCP 主机菜单"
-
-#: kchooser.cpp:66
-msgid "Hostname"
-msgstr "主机名"
-
-#: kchooser.cpp:68
-msgid "Status"
-msgstr "状态"
-
-#: kchooser.cpp:76
-msgid "Hos&t:"
-msgstr "主机(&T):"
-
-#: kchooser.cpp:77
-msgid "A&dd"
-msgstr "添加(&D)"
-
-#: kchooser.cpp:85
-msgid "&Accept"
-msgstr "接受(&A)"
-
-#: kchooser.cpp:87
-msgid "&Refresh"
-msgstr "刷新(&R)"
-
-#: kchooser.cpp:95 kgreeter.cpp:694
-msgid "&Menu"
-msgstr "菜单(&M)"
-
-#: kchooser.cpp:177
-msgid "<unknown>"
-msgstr "<未知>"
-
-#: kchooser.cpp:215
-#, c-format
-msgid "Unknown host %1"
-msgstr "未知的主机 %1"
-
-#: kgreeter.cpp:395
+#: kgreeter.cpp:595
msgid "Custom"
msgstr "自定义"
-#: kgreeter.cpp:396
+#: kgreeter.cpp:596
msgid "Failsafe"
msgstr "安全模式"
-#: kgreeter.cpp:470
+#: kgreeter.cpp:671
msgid " (previous)"
msgstr " (前一个)"
-#: kgreeter.cpp:529
+#: kgreeter.cpp:742
msgid ""
"Your saved session type '%1' is not valid any more.\n"
"Please select a new one, otherwise 'default' will be used."
@@ -122,11 +39,11 @@ msgstr ""
"你保存的“%1”会话类型不再有效。\n"
"请选择一个新的类型,否则将使用“默认”。"
-#: kgreeter.cpp:636
+#: kgreeter.cpp:851
msgid "Warning: this is an unsecured session"
msgstr "警告:这是不安全的会话"
-#: kgreeter.cpp:638
+#: kgreeter.cpp:853
msgid ""
"This display requires no X authorization.\n"
"This means that anybody can connect to it,\n"
@@ -136,288 +53,289 @@ msgstr ""
"这意味着任何人都可以连接、\n"
"在其中打开窗口或解释您的输入。"
-#: kgreeter.cpp:691
+#: kgreeter.cpp:916
msgid "L&ogin"
msgstr "登录(&O)"
-#: kgreeter.cpp:724 kgreeter.cpp:865
+#: kchooser.cpp:95 kgreeter.cpp:919
+msgid "&Menu"
+msgstr "菜单(&M)"
+
+#: kgreeter.cpp:949 kgreeter.cpp:1092
msgid "Session &Type"
msgstr "会话类型(&T)"
-#: kgreeter.cpp:729 kgreeter.cpp:871
+#: kgreeter.cpp:954 kgreeter.cpp:1104
msgid "&Authentication Method"
msgstr "认证方式(&A)"
-#: kgreeter.cpp:734 kgreeter.cpp:876
+#: kgreeter.cpp:959 kgreeter.cpp:1109
msgid "&Remote Login"
msgstr "远程登录(&R)"
-#: kgreeter.cpp:812
+#: kgreeter.cpp:1040
msgid "Login Failed."
msgstr "登录失败。"
-#: kconsole.cpp:75
-msgid "Cannot open console"
-msgstr "无法打开控制台"
+#: themer/tdmthemer.cpp:71
+#, c-format
+msgid "Cannot open theme file %1"
+msgstr "无法打开主题文件 %1"
-#: kconsole.cpp:159
-msgid ""
-"\n"
-"*** Cannot open console log source ***"
-msgstr ""
-"\n"
-"*** 无法打开终端日志源 ***"
+#: themer/tdmthemer.cpp:75
+#, c-format
+msgid "Cannot parse theme file %1"
+msgstr "无法分析主题文件 %1"
-#: kgdialog.cpp:61
-msgid "Sw&itch User"
-msgstr "切换用户(&I)"
+#: themer/tdmlabel.cpp:214
+msgid "Language"
+msgstr "语言"
-#: kgdialog.cpp:73
-msgid "R&estart X Server"
-msgstr "重启 X 服务器(&E)"
+#: themer/tdmlabel.cpp:215
+msgid "Session Type"
+msgstr "会话类型"
-#: kgdialog.cpp:73
-msgid "Clos&e Connection"
-msgstr "关闭连接(&E)"
+#: themer/tdmlabel.cpp:216
+msgid "Menu"
+msgstr "菜单"
-#: kgdialog.cpp:84
-msgid "Co&nsole Login"
-msgstr "控制台登录(&N)"
+#: themer/tdmlabel.cpp:217
+msgid "&Administration"
+msgstr ""
-#: kgdialog.cpp:87
-msgid "&Shutdown..."
-msgstr "关机(&S)..."
+#: themer/tdmlabel.cpp:218
+msgid "Disconnect"
+msgstr "断开连接"
-#: kgdialog.cpp:227
-msgid ""
-"_: session (location)\n"
-"%1 (%2)"
-msgstr "%1 (%2)"
+#: themer/tdmlabel.cpp:220
+#, fuzzy
+msgid "Power Off"
+msgstr "关机"
-#: kgverify.cpp:177
-msgid "No greeter widget plugin loaded. Check the configuration."
-msgstr "没有载入欢迎部件插件。请检查配置。"
+#: themer/tdmlabel.cpp:221
+msgid "Suspend"
+msgstr "挂起"
-#: kgverify.cpp:435
-msgid ""
-"Authenticating %1...\n"
-"\n"
-msgstr ""
-"%1 认证中...\n"
-"\n"
+#: themer/tdmlabel.cpp:222
+msgid "Reboot"
+msgstr "重新启动"
-#: kgverify.cpp:439
-msgid "You are required to change your password immediately (password aged)."
-msgstr "你被要求立即修改你的密码 (密码过期)。"
+#: themer/tdmlabel.cpp:223
+msgid "XDMCP Chooser"
+msgstr "XDMCP 选择器"
-#: kgverify.cpp:440
-msgid "You are required to change your password immediately (root enforced)."
-msgstr "你被要求立即修改你的密码(管理员强制执行)。"
+#: themer/tdmlabel.cpp:225
+msgid "Caps Lock is enabled."
+msgstr ""
-#: kgverify.cpp:441
-msgid "You are not allowed to login at the moment."
-msgstr "您不被允许在此时登录。"
+#: themer/tdmlabel.cpp:226
+#, c-format
+msgid "User %s will login in %d seconds"
+msgstr "用户 %s 将在 %d 秒后登录"
-#: kgverify.cpp:442
-msgid "Home folder not available."
-msgstr "主文件夹不可用。"
+#: themer/tdmlabel.cpp:227
+#, c-format
+msgid "Welcome to %h"
+msgstr "欢迎来到 %h"
-#: kgverify.cpp:443
-msgid ""
-"Logins are not allowed at the moment.\n"
-"Try again later."
-msgstr ""
-"这个时间不允许登录。\n"
-"稍后再试。"
+#: themer/tdmlabel.cpp:228
+msgid "Username:"
+msgstr "用户名:"
-#: kgverify.cpp:444
-msgid "Your login shell is not listed in /etc/shells."
-msgstr "您的登录 shell 没有列在 /etc/shells 中。"
+#: themer/tdmlabel.cpp:229
+msgid "Password:"
+msgstr "密码:"
-#: kgverify.cpp:445
-msgid "Root logins are not allowed."
-msgstr "不允许 Root 登录。"
+#: themer/tdmlabel.cpp:230
+msgid "Domain:"
+msgstr ""
-#: kgverify.cpp:446
-msgid "Your account has expired; please contact your system administrator."
-msgstr "您的账户已过期;请联系您的系统管理员。"
+#: themer/tdmlabel.cpp:231
+msgid "Login"
+msgstr "登录"
-#: kgverify.cpp:456
+#: themer/tdmlabel.cpp:270
+#, no-c-format
msgid ""
-"A critical error occurred.\n"
-"Please look at TDM's logfile(s) for more information\n"
-"or contact your system administrator."
-msgstr ""
-"出现了严重错误。\n"
-"请查看 TDM 的日志文件获得更多信息\n"
-"或联系系统管理员。"
+"_: date format\n"
+"%a %d %B"
+msgstr "%Y年%m月%d日"
-#: kgverify.cpp:482
-#, c-format
-msgid ""
-"_n: Your account expires tomorrow.\n"
-"Your account expires in %n days."
-msgstr "您的账户将于 %n 天后过期。"
+#: krootimage.cpp:38
+msgid "Fancy desktop background for tdm"
+msgstr "tdm 的梦幻桌面背景"
-#: kgverify.cpp:483
-msgid "Your account expires today."
-msgstr "您的账户今天过期。"
+#: krootimage.cpp:43
+msgid "Name of the configuration file"
+msgstr "配置文件名称"
-#: kgverify.cpp:490
-#, c-format
-msgid ""
-"_n: Your password expires tomorrow.\n"
-"Your password expires in %n days."
-msgstr "您的密码将于 %n 天后过期。"
+#: krootimage.cpp:121
+msgid "KRootImage"
+msgstr "KRootImage"
-#: kgverify.cpp:491
-msgid "Your password expires today."
-msgstr "您的密码今天过期。"
+#: kchooser.cpp:57
+msgid "&Local Login"
+msgstr "本地登录(&L)"
-#: kgverify.cpp:558 kgverify.cpp:1005
-msgid "Authentication failed"
-msgstr "认证失败"
+#: kchooser.cpp:61
+msgid "XDMCP Host Menu"
+msgstr "XDMCP 主机菜单"
-#: kgverify.cpp:695
-msgid ""
-"Authenticated user (%1) does not match requested user (%2).\n"
-msgstr ""
-"已认证用户 %1 和要求的用户 (%2)不匹配。\n"
+#: kchooser.cpp:66
+msgid "Hostname"
+msgstr "主机名"
-#: kgverify.cpp:988
-#, c-format
-msgid ""
-"_n: Automatic login in 1 second...\n"
-"Automatic login in %n seconds..."
-msgstr "即将于 %n 秒内自动登录..."
+#: kchooser.cpp:68
+msgid "Status"
+msgstr "状态"
-#: kgverify.cpp:997
-msgid "Warning: Caps Lock on"
-msgstr "警告:大写锁定"
+#: kchooser.cpp:76
+msgid "Hos&t:"
+msgstr "主机(&T):"
-#: kgverify.cpp:1002
-msgid "Change failed"
-msgstr "更改失败"
+#: kchooser.cpp:77
+msgid "A&dd"
+msgstr "添加(&D)"
-#: kgverify.cpp:1004
-msgid "Login failed"
-msgstr "登录失败"
+#: kchooser.cpp:85
+msgid "&Accept"
+msgstr "接受(&A)"
-#: kgverify.cpp:1038
-msgid "Theme not usable with authentication method '%1'."
-msgstr "使用身份验证方式“%1”时无法使用主题。"
+#: kchooser.cpp:87
+msgid "&Refresh"
+msgstr "刷新(&R)"
-#: kgverify.cpp:1093
-msgid "Changing authentication token"
-msgstr "更改认证标记"
+#: kchooser.cpp:177
+msgid "<unknown>"
+msgstr "<未知>"
-#: tdmshutdown.cpp:92
+#: kchooser.cpp:215
+#, c-format
+msgid "Unknown host %1"
+msgstr "未知的主机 %1"
+
+#: tdmshutdown.cpp:97
msgid "Root authorization required."
msgstr "需要 Root 身份验证。"
-#: tdmshutdown.cpp:123 tdmshutdown.cpp:516
+#: tdmshutdown.cpp:128 tdmshutdown.cpp:602
msgid "&Schedule..."
msgstr "安排(&S)..."
-#: tdmshutdown.cpp:246
+#: tdmshutdown.cpp:247 tdmshutdown.cpp:473
+#, fuzzy
+msgid "Shutdown TDE"
+msgstr "关机类型"
+
+#: tdmshutdown.cpp:253
msgid "Shutdown Type"
msgstr "关机类型"
-#: tdmshutdown.cpp:250
+#: tdmshutdown.cpp:257
msgid "&Turn off computer"
msgstr "关闭计算机(&T)"
-#: tdmshutdown.cpp:254
+#: tdmshutdown.cpp:261
msgid "&Restart computer"
msgstr "重启计算机(&R)"
-#: tdmshutdown.cpp:282
+#: tdmshutdown.cpp:289
msgid "Scheduling"
msgstr "安排"
-#: tdmshutdown.cpp:286
+#: tdmshutdown.cpp:293
msgid "&Start:"
msgstr "开始(&S):"
-#: tdmshutdown.cpp:289
+#: tdmshutdown.cpp:296
msgid "T&imeout:"
msgstr "超时(&I):"
-#: tdmshutdown.cpp:291
+#: tdmshutdown.cpp:298
msgid "&Force after timeout"
msgstr "超时后强制(&F)"
-#: tdmshutdown.cpp:340
+#: tdmshutdown.cpp:347
msgid "Entered start date is invalid."
msgstr "输入的开始日期无效。"
-#: tdmshutdown.cpp:349
+#: tdmshutdown.cpp:356
msgid "Entered timeout date is invalid."
msgstr "输入的超时日期无效。"
-#: tdmshutdown.cpp:482
-msgid "&Turn Off Computer"
-msgstr "关闭计算机(&T)"
-
-#: tdmshutdown.cpp:489
-msgid "&Restart Computer"
-msgstr "重启计算机(&R)"
+#: tdmshutdown.cpp:501
+#, fuzzy
+msgid "&Restart"
+msgstr "开始(&S):"
-#: tdmshutdown.cpp:504
+#: tdmshutdown.cpp:521 tdmshutdown.cpp:590
msgid ""
"_: current option in boot loader\n"
"%1 (current)"
msgstr "%1 (当前)"
-#: tdmshutdown.cpp:608
+#: tdmshutdown.cpp:532
+#, fuzzy
+msgid "&Turn Off"
+msgstr "关闭计算机(&T)"
+
+#: tdmshutdown.cpp:568
+msgid "&Turn Off Computer"
+msgstr "关闭计算机(&T)"
+
+#: tdmshutdown.cpp:575
+msgid "&Restart Computer"
+msgstr "重启计算机(&R)"
+
+#: tdmshutdown.cpp:819
msgid "Turn Off Computer"
msgstr "关闭计算机"
-#: tdmshutdown.cpp:611
+#: tdmshutdown.cpp:822
msgid "Switch to Console"
msgstr "切换到控制台"
-#: tdmshutdown.cpp:613
+#: tdmshutdown.cpp:824
msgid "Restart Computer"
msgstr "重启计算机"
-#: tdmshutdown.cpp:615
+#: tdmshutdown.cpp:826
msgid "<br>(Next boot: %1)"
msgstr "<br>(下次启动:%1)"
-#: tdmshutdown.cpp:627
+#: tdmshutdown.cpp:838
msgid "Abort active sessions:"
msgstr "中断当前会话:"
-#: tdmshutdown.cpp:628
+#: tdmshutdown.cpp:839
msgid "No permission to abort active sessions:"
msgstr "无权中断当前会话:"
-#: tdmshutdown.cpp:635
+#: tdmshutdown.cpp:846
msgid "Session"
msgstr "会话"
-#: tdmshutdown.cpp:636
+#: tdmshutdown.cpp:847
msgid "Location"
msgstr "位置"
-#: tdmshutdown.cpp:667
+#: tdmshutdown.cpp:878
msgid "Abort pending shutdown:"
msgstr "中断推迟的关机:"
-#: tdmshutdown.cpp:668
+#: tdmshutdown.cpp:879
msgid "No permission to abort pending shutdown:"
msgstr "无权中断推迟的关机:"
-#: tdmshutdown.cpp:674
+#: tdmshutdown.cpp:885
msgid "now"
msgstr "立即"
-#: tdmshutdown.cpp:680
+#: tdmshutdown.cpp:891
msgid "infinite"
msgstr "无穷"
-#: tdmshutdown.cpp:686
+#: tdmshutdown.cpp:897
msgid ""
"Owner: %1\n"
"Type: %2%5\n"
@@ -429,23 +347,23 @@ msgstr ""
"开始:%3\n"
"超时:%4"
-#: tdmshutdown.cpp:691
+#: tdmshutdown.cpp:902
msgid "console user"
msgstr "控制台用户"
-#: tdmshutdown.cpp:693
+#: tdmshutdown.cpp:904
msgid "control socket"
msgstr "控制台套接字"
-#: tdmshutdown.cpp:696
+#: tdmshutdown.cpp:907
msgid "turn off computer"
msgstr "关闭计算机"
-#: tdmshutdown.cpp:697
+#: tdmshutdown.cpp:908
msgid "restart computer"
msgstr "重启计算机"
-#: tdmshutdown.cpp:700
+#: tdmshutdown.cpp:911
#, c-format
msgid ""
"\n"
@@ -454,7 +372,7 @@ msgstr ""
"\n"
"下次启动:%1"
-#: tdmshutdown.cpp:703
+#: tdmshutdown.cpp:914
#, c-format
msgid ""
"\n"
@@ -463,89 +381,203 @@ msgstr ""
"\n"
"超时后:%1"
-#: tdmshutdown.cpp:705
+#: tdmshutdown.cpp:916
msgid "abort all sessions"
msgstr "中断全部会话"
-#: tdmshutdown.cpp:707
+#: tdmshutdown.cpp:918
msgid "abort own sessions"
msgstr "中断所属会话"
-#: tdmshutdown.cpp:708
+#: tdmshutdown.cpp:919
msgid "cancel shutdown"
msgstr "取消关机"
-#: themer/tdmlabel.cpp:170
-msgid "Language"
-msgstr "语言"
+#: kgverify.cpp:177
+msgid "No greeter widget plugin loaded. Check the configuration."
+msgstr "没有载入欢迎部件插件。请检查配置。"
-#: themer/tdmlabel.cpp:171
-msgid "Session Type"
-msgstr "会话类型"
+#: kgverify.cpp:442
+msgid ""
+"Authenticating %1...\n"
+"\n"
+msgstr ""
+"%1 认证中...\n"
+"\n"
-#: themer/tdmlabel.cpp:172
-msgid "Menu"
-msgstr "菜单"
+#: kgverify.cpp:446
+msgid "You are required to change your password immediately (password aged)."
+msgstr "你被要求立即修改你的密码 (密码过期)。"
-#: themer/tdmlabel.cpp:173
-msgid "Disconnect"
-msgstr "断开连接"
+#: kgverify.cpp:447
+msgid "You are required to change your password immediately (root enforced)."
+msgstr "你被要求立即修改你的密码(管理员强制执行)。"
-#: themer/tdmlabel.cpp:175
-msgid "Power off"
-msgstr "关机"
+#: kgverify.cpp:448
+msgid "You are not allowed to login at the moment."
+msgstr "您不被允许在此时登录。"
-#: themer/tdmlabel.cpp:176
-msgid "Suspend"
-msgstr "挂起"
+#: kgverify.cpp:449
+msgid "Home folder not available."
+msgstr "主文件夹不可用。"
-#: themer/tdmlabel.cpp:177
-msgid "Reboot"
-msgstr "重新启动"
+#: kgverify.cpp:450
+msgid ""
+"Logins are not allowed at the moment.\n"
+"Try again later."
+msgstr ""
+"这个时间不允许登录。\n"
+"稍后再试。"
-#: themer/tdmlabel.cpp:178
-msgid "XDMCP Chooser"
-msgstr "XDMCP 选择器"
+#: kgverify.cpp:451
+msgid "Your login shell is not listed in /etc/shells."
+msgstr "您的登录 shell 没有列在 /etc/shells 中。"
-#: themer/tdmlabel.cpp:180
-msgid "You have got caps lock on."
-msgstr "您打开了 Caps Lock。"
+#: kgverify.cpp:452
+msgid "Root logins are not allowed."
+msgstr "不允许 Root 登录。"
-#: themer/tdmlabel.cpp:181
-#, c-format
-msgid "User %s will login in %d seconds"
-msgstr "用户 %s 将在 %d 秒后登录"
+#: kgverify.cpp:453
+msgid "Your account has expired; please contact your system administrator."
+msgstr "您的账户已过期;请联系您的系统管理员。"
+
+#: kgverify.cpp:463
+msgid ""
+"A critical error occurred.\n"
+"Please look at TDM's logfile(s) for more information\n"
+"or contact your system administrator."
+msgstr ""
+"出现了严重错误。\n"
+"请查看 TDM 的日志文件获得更多信息\n"
+"或联系系统管理员。"
-#: themer/tdmlabel.cpp:182
+#: kgverify.cpp:489
#, c-format
-msgid "Welcome to %h"
-msgstr "欢迎来到 %h"
+msgid ""
+"_n: Your account expires tomorrow.\n"
+"Your account expires in %n days."
+msgstr "您的账户将于 %n 天后过期。"
-#: themer/tdmlabel.cpp:183
-msgid "Username:"
-msgstr "用户名:"
+#: kgverify.cpp:490
+msgid "Your account expires today."
+msgstr "您的账户今天过期。"
-#: themer/tdmlabel.cpp:184
-msgid "Password:"
-msgstr "密码:"
+#: kgverify.cpp:497
+#, c-format
+msgid ""
+"_n: Your password expires tomorrow.\n"
+"Your password expires in %n days."
+msgstr "您的密码将于 %n 天后过期。"
-#: themer/tdmlabel.cpp:185
-msgid "Login"
-msgstr "登录"
+#: kgverify.cpp:498
+msgid "Your password expires today."
+msgstr "您的密码今天过期。"
-#: themer/tdmlabel.cpp:225
-#, no-c-format
+#: kgverify.cpp:565 kgverify.cpp:1012
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: kgverify.cpp:702
msgid ""
-"_: date format\n"
-"%a %d %B"
-msgstr "%Y年%m月%d日"
+"Authenticated user (%1) does not match requested user (%2).\n"
+msgstr ""
+"已认证用户 %1 和要求的用户 (%2)不匹配。\n"
-#: themer/tdmthemer.cpp:67
+#: kgverify.cpp:995
#, c-format
-msgid "Cannot open theme file %1"
-msgstr "无法打开主题文件 %1"
+msgid ""
+"_n: Automatic login in 1 second...\n"
+"Automatic login in %n seconds..."
+msgstr "即将于 %n 秒内自动登录..."
-#: themer/tdmthemer.cpp:71
+#: kgverify.cpp:1004
+msgid "Warning: Caps Lock on"
+msgstr "警告:大写锁定"
+
+#: kgverify.cpp:1009
+msgid "Change failed"
+msgstr "更改失败"
+
+#: kgverify.cpp:1011
+msgid "Login failed"
+msgstr "登录失败"
+
+#: kgverify.cpp:1045
+msgid "Theme not usable with authentication method '%1'."
+msgstr "使用身份验证方式“%1”时无法使用主题。"
+
+#: kgverify.cpp:1100
+msgid "Changing authentication token"
+msgstr "更改认证标记"
+
+#: kfdialog.cpp:167
+msgid "Question"
+msgstr ""
+
+#: tdmconfig.cpp:141
+msgid "[fix tdmrc!]"
+msgstr "[修补 tdmrc!]"
+
+#: tdmconfig.cpp:156
+msgid ""
+"_n: %1: TTY login\n"
+"%1: %n TTY logins"
+msgstr "%1:%n 次 TTY 登录"
+
+#: tdmconfig.cpp:167
+msgid "Unused"
+msgstr "未用"
+
+#: tdmconfig.cpp:169
+msgid ""
+"_: user: session type\n"
+"%1: %2"
+msgstr "%1:%2"
+
+#: tdmconfig.cpp:171
#, c-format
-msgid "Cannot parse theme file %1"
-msgstr "无法分析主题文件 %1"
+msgid ""
+"_: ... host\n"
+"X login on %1"
+msgstr "%1 上的 X 登录"
+
+#: kgdialog.cpp:62
+msgid "Sw&itch User"
+msgstr "切换用户(&I)"
+
+#: kgdialog.cpp:74
+msgid "R&estart X Server"
+msgstr "重启 X 服务器(&E)"
+
+#: kgdialog.cpp:74
+msgid "Clos&e Connection"
+msgstr "关闭连接(&E)"
+
+#: kgdialog.cpp:85
+msgid "Co&nsole Login"
+msgstr "控制台登录(&N)"
+
+#: kgdialog.cpp:89
+msgid "&Shutdown..."
+msgstr "关机(&S)..."
+
+#: kgdialog.cpp:229
+msgid ""
+"_: session (location)\n"
+"%1 (%2)"
+msgstr "%1 (%2)"
+
+#: kconsole.cpp:75
+msgid "Cannot open console"
+msgstr "无法打开控制台"
+
+#: kconsole.cpp:159
+msgid ""
+"\n"
+"*** Cannot open console log source ***"
+msgstr ""
+"\n"
+"*** 无法打开终端日志源 ***"
+
+#~ msgid "You have got caps lock on."
+#~ msgstr "您打开了 Caps Lock。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/trashapplet.po b/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
index ddcf898fafd..5bc13fa10d7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: trashapplet\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-03 10:12+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin.po b/tde-i18n-zh_CN/messages/tdebase/twin.po
index 2bb6ac5c6f6..7857ea2a37a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin.po
@@ -7,10 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2008-03-10 01:27+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-21 17:21+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,10 +30,82 @@ msgid ""
"Your emails"
msgstr "lark@linux.net.cn"
-#: activation.cpp:695
+#: activation.cpp:738
msgid "Window '%1' demands attention."
msgstr "窗口“%1”请求注意。"
+#: client.cpp:2004
+msgid "Suspended"
+msgstr ""
+
+#: main.cpp:64
+#, fuzzy
+msgid ""
+"[twin] it looks like there's already a window manager running. twin not "
+"started.\n"
+msgstr ""
+"twin:看起来已经有一个窗口管理器在运行。twin 没有起动。\n"
+
+#: main.cpp:79
+#, fuzzy
+msgid "[twin] failure during initialization; aborting"
+msgstr "twin:在初始化时失败;中止"
+
+#: main.cpp:138 main.cpp:144 main.cpp:150
+#, fuzzy
+msgid ""
+"[twin] unable to claim manager selection, another wm running? (try using "
+"--replace)\n"
+msgstr ""
+"twin:无法声明窗口管理器选择,是否正在运行另外一种窗口管理器?(试着使用 --replace)\n"
+
+#: main.cpp:237
+msgid "TDE window manager"
+msgstr "TDE 窗口管理器"
+
+#: main.cpp:241
+msgid "Disable configuration options"
+msgstr "禁用配置选项"
+
+#: main.cpp:242
+msgid "Replace already-running ICCCM2.0-compliant window manager"
+msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
+
+#: main.cpp:243
+msgid "Do not start composition manager"
+msgstr ""
+
+#: killer/killer.cpp:49 main.cpp:319
+msgid "TWin"
+msgstr ""
+
+#: main.cpp:321
+#, fuzzy
+msgid "(c) 1999-2005, The KDE Developers"
+msgstr "(C) 1999-2005,TDE 开发者"
+
+#: main.cpp:325
+msgid "Maintainer"
+msgstr "维护者"
+
+#: plugins.cpp:32
+#, fuzzy
+msgid "TWin: "
+msgstr "KWin:"
+
+#: plugins.cpp:33
+#, fuzzy
+msgid ""
+"\n"
+"TWin will now exit..."
+msgstr ""
+"\n"
+"KWin 现在退出..."
+
+#: tabbox.cpp:53
+msgid "*** No Windows ***"
+msgstr "*** 没有窗口 ***"
+
#: twinbindings.cpp:18
msgid "System"
msgstr "系统"
@@ -50,427 +123,469 @@ msgid "Walk Through Windows (Reverse)"
msgstr "遍历窗口(反向)"
#: twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "遍历窗口"
+
+#: twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "遍历窗口(反向)"
+
+#: twinbindings.cpp:25
msgid "Walk Through Desktops"
msgstr "遍历桌面"
-#: twinbindings.cpp:24
+#: twinbindings.cpp:26
msgid "Walk Through Desktops (Reverse)"
msgstr "遍历桌面(反向)"
-#: twinbindings.cpp:25
+#: twinbindings.cpp:27
msgid "Walk Through Desktop List"
msgstr "遍历桌面列表"
-#: twinbindings.cpp:26
+#: twinbindings.cpp:28
msgid "Walk Through Desktop List (Reverse)"
msgstr "遍历桌面列表(反向)"
-#: twinbindings.cpp:28
+#: twinbindings.cpp:30
msgid "Windows"
msgstr "窗口"
-#: twinbindings.cpp:29
+#: twinbindings.cpp:31
msgid "Window Operations Menu"
msgstr "窗口操作菜单"
-#: twinbindings.cpp:30
+#: twinbindings.cpp:32
msgid "Close Window"
msgstr "关闭窗口"
-#: twinbindings.cpp:32
+#: twinbindings.cpp:34
msgid "Maximize Window"
msgstr "最大化窗口"
-#: twinbindings.cpp:34
+#: twinbindings.cpp:36
msgid "Maximize Window Vertically"
msgstr "垂直最大化窗口"
-#: twinbindings.cpp:36
+#: twinbindings.cpp:38
msgid "Maximize Window Horizontally"
msgstr "水平最大化窗口"
-#: twinbindings.cpp:38
+#: twinbindings.cpp:40
msgid "Minimize Window"
msgstr "最小化窗口"
-#: twinbindings.cpp:40
+#: twinbindings.cpp:42
msgid "Shade Window"
msgstr "卷起窗口"
-#: twinbindings.cpp:42
+#: twinbindings.cpp:44
msgid "Move Window"
msgstr "移动窗口"
-#: twinbindings.cpp:44
+#: twinbindings.cpp:46
msgid "Resize Window"
msgstr "更改窗口大小"
-#: twinbindings.cpp:46
+#: twinbindings.cpp:48
msgid "Raise Window"
msgstr "升起窗口"
-#: twinbindings.cpp:48
+#: twinbindings.cpp:50
msgid "Lower Window"
msgstr "降低窗口"
-#: twinbindings.cpp:50
+#: twinbindings.cpp:52
msgid "Toggle Window Raise/Lower"
msgstr "窗口置前或置后"
-#: twinbindings.cpp:51
+#: twinbindings.cpp:53
msgid "Make Window Fullscreen"
msgstr "将窗口放至全屏"
-#: twinbindings.cpp:53
+#: twinbindings.cpp:55
msgid "Hide Window Border"
msgstr "隐藏窗口边框"
-#: twinbindings.cpp:55
+#: twinbindings.cpp:57
msgid "Keep Window Above Others"
msgstr "让窗口常居顶端"
-#: twinbindings.cpp:57
+#: twinbindings.cpp:59
msgid "Keep Window Below Others"
msgstr "让窗口常居底端"
-#: twinbindings.cpp:59
+#: twinbindings.cpp:61
msgid "Activate Window Demanding Attention"
msgstr "激活请求注意的窗口"
-#: twinbindings.cpp:60
+#: twinbindings.cpp:62
msgid "Setup Window Shortcut"
msgstr "设置窗口快捷键"
-#: twinbindings.cpp:61
+#: twinbindings.cpp:63
msgid "Pack Window to the Right"
msgstr "将窗口推至右侧"
-#: twinbindings.cpp:63
+#: twinbindings.cpp:65
msgid "Pack Window to the Left"
msgstr "将窗口推至左侧"
-#: twinbindings.cpp:65
+#: twinbindings.cpp:67
msgid "Pack Window Up"
msgstr "将窗口推至上侧"
-#: twinbindings.cpp:67
+#: twinbindings.cpp:69
msgid "Pack Window Down"
msgstr "将窗口推至下侧"
-#: twinbindings.cpp:69
+#: twinbindings.cpp:71
msgid "Pack Grow Window Horizontally"
msgstr "将窗口水平扩展"
-#: twinbindings.cpp:71
+#: twinbindings.cpp:73
msgid "Pack Grow Window Vertically"
msgstr "将窗口垂直扩展"
-#: twinbindings.cpp:73
+#: twinbindings.cpp:75
msgid "Pack Shrink Window Horizontally"
msgstr "将窗口水平收缩"
-#: twinbindings.cpp:75
+#: twinbindings.cpp:77
msgid "Pack Shrink Window Vertically"
msgstr "将窗口垂直收缩"
-#: twinbindings.cpp:78
+#: twinbindings.cpp:80
msgid "Window & Desktop"
msgstr "窗口和桌面"
-#: twinbindings.cpp:79
+#: twinbindings.cpp:81
msgid "Keep Window on All Desktops"
msgstr "将窗口放到全部桌面"
-#: twinbindings.cpp:81
+#: twinbindings.cpp:83
msgid "Window to Desktop 1"
msgstr "窗口到桌面 1"
-#: twinbindings.cpp:82
+#: twinbindings.cpp:84
msgid "Window to Desktop 2"
msgstr "窗口到桌面 2"
-#: twinbindings.cpp:83
+#: twinbindings.cpp:85
msgid "Window to Desktop 3"
msgstr "窗口到桌面 3"
-#: twinbindings.cpp:84
+#: twinbindings.cpp:86
msgid "Window to Desktop 4"
msgstr "窗口到桌面 4"
-#: twinbindings.cpp:85
+#: twinbindings.cpp:87
msgid "Window to Desktop 5"
msgstr "窗口到桌面 5"
-#: twinbindings.cpp:86
+#: twinbindings.cpp:88
msgid "Window to Desktop 6"
msgstr "窗口到桌面 6"
-#: twinbindings.cpp:87
+#: twinbindings.cpp:89
msgid "Window to Desktop 7"
msgstr "窗口到桌面 7"
-#: twinbindings.cpp:88
+#: twinbindings.cpp:90
msgid "Window to Desktop 8"
msgstr "窗口到桌面 8"
-#: twinbindings.cpp:89
+#: twinbindings.cpp:91
msgid "Window to Desktop 9"
msgstr "窗口到桌面 9"
-#: twinbindings.cpp:90
+#: twinbindings.cpp:92
msgid "Window to Desktop 10"
msgstr "窗口到桌面 10"
-#: twinbindings.cpp:91
+#: twinbindings.cpp:93
msgid "Window to Desktop 11"
msgstr "窗口到桌面 11"
-#: twinbindings.cpp:92
+#: twinbindings.cpp:94
msgid "Window to Desktop 12"
msgstr "窗口到桌面 12"
-#: twinbindings.cpp:93
+#: twinbindings.cpp:95
msgid "Window to Desktop 13"
msgstr "窗口到桌面 13"
-#: twinbindings.cpp:94
+#: twinbindings.cpp:96
msgid "Window to Desktop 14"
msgstr "窗口到桌面 14"
-#: twinbindings.cpp:95
+#: twinbindings.cpp:97
msgid "Window to Desktop 15"
msgstr "窗口到桌面 15"
-#: twinbindings.cpp:96
+#: twinbindings.cpp:98
msgid "Window to Desktop 16"
msgstr "窗口到桌面 16"
-#: twinbindings.cpp:97
+#: twinbindings.cpp:99
msgid "Window to Desktop 17"
msgstr "窗口到桌面 17"
-#: twinbindings.cpp:98
+#: twinbindings.cpp:100
msgid "Window to Desktop 18"
msgstr "窗口到桌面 18"
-#: twinbindings.cpp:99
+#: twinbindings.cpp:101
msgid "Window to Desktop 19"
msgstr "窗口到桌面 19"
-#: twinbindings.cpp:100
+#: twinbindings.cpp:102
msgid "Window to Desktop 20"
msgstr "窗口到桌面 20"
-#: twinbindings.cpp:101
+#: twinbindings.cpp:103
msgid "Window to Next Desktop"
msgstr "窗口到下一桌面"
-#: twinbindings.cpp:102
+#: twinbindings.cpp:104
msgid "Window to Previous Desktop"
msgstr "窗口到前一桌面"
-#: twinbindings.cpp:103
+#: twinbindings.cpp:105
msgid "Window One Desktop to the Right"
msgstr "窗口右移一个桌面"
-#: twinbindings.cpp:104
+#: twinbindings.cpp:106
msgid "Window One Desktop to the Left"
msgstr "窗口左移一个桌面"
-#: twinbindings.cpp:105
+#: twinbindings.cpp:107
msgid "Window One Desktop Up"
msgstr "窗口上移一个桌面"
-#: twinbindings.cpp:106
+#: twinbindings.cpp:108
msgid "Window One Desktop Down"
msgstr "窗口下移一个桌面"
-#: twinbindings.cpp:108
+#: twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "窗口到下一桌面"
+
+#: twinbindings.cpp:119
msgid "Desktop Switching"
msgstr "桌面切换"
-#: twinbindings.cpp:109
+#: twinbindings.cpp:120
msgid "Switch to Desktop 1"
msgstr "切换到桌面 1"
-#: twinbindings.cpp:110
+#: twinbindings.cpp:121
msgid "Switch to Desktop 2"
msgstr "切换到桌面 2"
-#: twinbindings.cpp:111
+#: twinbindings.cpp:122
msgid "Switch to Desktop 3"
msgstr "切换到桌面 3"
-#: twinbindings.cpp:112
+#: twinbindings.cpp:123
msgid "Switch to Desktop 4"
msgstr "切换到桌面 4"
-#: twinbindings.cpp:113
+#: twinbindings.cpp:124
msgid "Switch to Desktop 5"
msgstr "切换到桌面 5"
-#: twinbindings.cpp:114
+#: twinbindings.cpp:125
msgid "Switch to Desktop 6"
msgstr "切换到桌面 6"
-#: twinbindings.cpp:115
+#: twinbindings.cpp:126
msgid "Switch to Desktop 7"
msgstr "切换到桌面 7"
-#: twinbindings.cpp:116
+#: twinbindings.cpp:127
msgid "Switch to Desktop 8"
msgstr "切换到桌面 8"
-#: twinbindings.cpp:117
+#: twinbindings.cpp:128
msgid "Switch to Desktop 9"
msgstr "切换到桌面 9"
-#: twinbindings.cpp:118
+#: twinbindings.cpp:129
msgid "Switch to Desktop 10"
msgstr "切换到桌面 10"
-#: twinbindings.cpp:119
+#: twinbindings.cpp:130
msgid "Switch to Desktop 11"
msgstr "切换到桌面 11"
-#: twinbindings.cpp:120
+#: twinbindings.cpp:131
msgid "Switch to Desktop 12"
msgstr "切换到桌面 12"
-#: twinbindings.cpp:121
+#: twinbindings.cpp:132
msgid "Switch to Desktop 13"
msgstr "切换到桌面 13"
-#: twinbindings.cpp:122
+#: twinbindings.cpp:133
msgid "Switch to Desktop 14"
msgstr "切换到桌面 14"
-#: twinbindings.cpp:123
+#: twinbindings.cpp:134
msgid "Switch to Desktop 15"
msgstr "切换到桌面 15"
-#: twinbindings.cpp:124
+#: twinbindings.cpp:135
msgid "Switch to Desktop 16"
msgstr "切换到桌面 16"
-#: twinbindings.cpp:125
+#: twinbindings.cpp:136
msgid "Switch to Desktop 17"
msgstr "切换到桌面 17"
-#: twinbindings.cpp:126
+#: twinbindings.cpp:137
msgid "Switch to Desktop 18"
msgstr "切换到桌面 18"
-#: twinbindings.cpp:127
+#: twinbindings.cpp:138
msgid "Switch to Desktop 19"
msgstr "切换到桌面 19"
-#: twinbindings.cpp:128
+#: twinbindings.cpp:139
msgid "Switch to Desktop 20"
msgstr "切换到桌面 20"
-#: twinbindings.cpp:129
+#: twinbindings.cpp:140
msgid "Switch to Next Desktop"
msgstr "切换到前一桌面"
-#: twinbindings.cpp:130
+#: twinbindings.cpp:141
msgid "Switch to Previous Desktop"
msgstr "切换到后一桌面"
-#: twinbindings.cpp:131
+#: twinbindings.cpp:142
msgid "Switch One Desktop to the Right"
msgstr "切换到右边的桌面"
-#: twinbindings.cpp:132
+#: twinbindings.cpp:143
msgid "Switch One Desktop to the Left"
msgstr "切换到左边的桌面"
-#: twinbindings.cpp:133
+#: twinbindings.cpp:144
msgid "Switch One Desktop Up"
msgstr "切换到上面的桌面"
-#: twinbindings.cpp:134
+#: twinbindings.cpp:145
msgid "Switch One Desktop Down"
msgstr "切换到下面的桌面"
-#: twinbindings.cpp:137
+#: twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "切换到桌面 10"
+
+#: twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "切换到桌面 1"
+
+#: twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "切换到桌面 2"
+
+#: twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "切换到桌面 3"
+
+#: twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "切换到桌面 4"
+
+#: twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "切换到桌面 5"
+
+#: twinbindings.cpp:152
+#, fuzzy
+msgid "Switch to Screen 6"
+msgstr "切换到桌面 6"
+
+#: twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "切换到桌面 7"
+
+#: twinbindings.cpp:154
+#, fuzzy
+msgid "Switch to Next Screen"
+msgstr "切换到前一桌面"
+
+#: twinbindings.cpp:157
msgid "Mouse Emulation"
msgstr "鼠标模拟"
-#: twinbindings.cpp:138
+#: twinbindings.cpp:158
msgid "Kill Window"
msgstr "杀死窗口"
-#: twinbindings.cpp:139
+#: twinbindings.cpp:159
msgid "Window Screenshot"
msgstr "窗口抓图"
-#: twinbindings.cpp:140
+#: twinbindings.cpp:160
msgid "Desktop Screenshot"
msgstr "桌面抓图"
-#: twinbindings.cpp:145
+#: twinbindings.cpp:165
msgid "Block Global Shortcuts"
msgstr "屏蔽全局快捷键"
-#: main.cpp:65
-msgid ""
-"twin: it looks like there's already a window manager running. twin not "
-"started.\n"
-msgstr ""
-"twin:看起来已经有一个窗口管理器在运行。twin 没有起动。\n"
-
-#: main.cpp:80
-msgid "twin: failure during initialization; aborting"
-msgstr "twin:在初始化时失败;中止"
-
-#: main.cpp:101
-msgid ""
-"twin: unable to claim manager selection, another wm running? (try using "
-"--replace)\n"
-msgstr ""
-"twin:无法声明窗口管理器选择,是否正在运行另外一种窗口管理器?(试着使用 --replace)\n"
-
-#: main.cpp:182
-msgid "TDE window manager"
-msgstr "TDE 窗口管理器"
-
-#: main.cpp:186
-msgid "Disable configuration options"
-msgstr "禁用配置选项"
-
-#: main.cpp:187
-msgid "Replace already-running ICCCM2.0-compliant window manager"
-msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
-
-#: killer/killer.cpp:49 main.cpp:263
-msgid "KWin"
-msgstr "KWin"
-
-#: main.cpp:265
-msgid "(c) 1999-2005, The TDE Developers"
-msgstr "(C) 1999-2005,TDE 开发者"
-
-#: main.cpp:269
-msgid "Maintainer"
-msgstr "维护者"
-
-#: plugins.cpp:32
-msgid "KWin: "
-msgstr "KWin:"
-
-#: plugins.cpp:33
-msgid ""
-"\n"
-"KWin will now exit..."
-msgstr ""
-"\n"
-"KWin 现在退出..."
-
-#: tabbox.cpp:55
-msgid "*** No Windows ***"
-msgstr "*** 没有窗口 ***"
-
#: useractions.cpp:62
msgid "Keep &Above Others"
msgstr "常居顶端(&A)"
@@ -487,72 +602,86 @@ msgstr "全屏(&F)"
msgid "&No Border"
msgstr "无边框(&N)"
-#: useractions.cpp:69
+#: useractions.cpp:68
+#, fuzzy
+msgid "Shad&ow"
+msgstr "卷起"
+
+#: useractions.cpp:70
msgid "Window &Shortcut..."
msgstr "窗口快捷键(&S)..."
-#: useractions.cpp:70
+#: useractions.cpp:72
+#, fuzzy
+msgid "&Suspend Application"
+msgstr "特殊应用程序设置(&S)..."
+
+#: useractions.cpp:73
+msgid "&Resume Application"
+msgstr ""
+
+#: useractions.cpp:75
msgid "&Special Window Settings..."
msgstr "特殊窗口设置(&S)..."
-#: useractions.cpp:71
+#: useractions.cpp:76
msgid "&Special Application Settings..."
msgstr "特殊应用程序设置(&S)..."
-#: useractions.cpp:73
+#: useractions.cpp:78
msgid "Ad&vanced"
msgstr "高级(&V)"
-#: useractions.cpp:80
+#: useractions.cpp:85
msgid "Reset opacity to default value"
msgstr "将不透明度重置为默认值"
-#: useractions.cpp:82
+#: useractions.cpp:87
msgid "Slide this to set the window's opacity"
msgstr "拖曳此滑块可设定窗口的不透明度"
-#: useractions.cpp:89
+#: useractions.cpp:94
msgid "&Opacity"
msgstr "不透明度(&O)"
-#: useractions.cpp:92
+#: useractions.cpp:97
msgid "&Move"
msgstr "移动(&M)"
-#: useractions.cpp:93
+#: useractions.cpp:98
msgid "Re&size"
msgstr "大小(&S)"
-#: useractions.cpp:94
+#: useractions.cpp:99
msgid "Mi&nimize"
msgstr "最小化(&N)"
-#: useractions.cpp:95
+#: useractions.cpp:100
msgid "Ma&ximize"
msgstr "最大化(&X)"
-#: useractions.cpp:96
+#: useractions.cpp:101
msgid "Sh&ade"
msgstr "卷起(&A)"
-#: useractions.cpp:103
+#: useractions.cpp:108
msgid "Configur&e Window Behavior..."
msgstr "配置窗口行为(&E)..."
-#: useractions.cpp:198
+#: useractions.cpp:209
msgid "To &Desktop"
msgstr "到桌面(&D)"
-#: useractions.cpp:211
+#: useractions.cpp:222
msgid "&All Desktops"
msgstr "全部桌面(&A)"
-#: workspace.cpp:1017 workspace.cpp:1037
+#: workspace.cpp:1182 workspace.cpp:1202
#, c-format
msgid "Desktop %1"
msgstr "桌面 %1"
-#: workspace.cpp:2397
+#: workspace.cpp:2754
msgid ""
"You have selected to show a window without its border.\n"
"Without the border, you will not be able to enable the border again using the "
@@ -562,7 +691,7 @@ msgstr ""
"您选择了显示没有边框的窗口。\n"
"没有边框的话,您就无法使用鼠标再次启用边框:请使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
-#: workspace.cpp:2409
+#: workspace.cpp:2766
msgid ""
"You have selected to show a window in fullscreen mode.\n"
"If the application itself does not have an option to turn the fullscreen mode "
@@ -572,32 +701,28 @@ msgstr ""
"您选择了以全屏模式显示窗口。\n"
"如果应用程序自身没有提供退出全屏模式的选项,您就无法使用鼠标退出全屏模式:请使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
-#: workspace.cpp:2446 workspace.cpp:2528
-msgid ""
-"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in "
-"a $PATH directory."
-msgstr ""
-"无法启动复合管理器。\\n请确定您在 $PATH 目录中存有“kompmgr”。"
-
-#: workspace.cpp:2506
+#: workspace.cpp:2899
msgid ""
"The Composite Manager crashed twice within a minute and is therefore disabled "
"for this session."
msgstr "复合管理器在一分钟之内崩溃了两次,因此本次会话中该特性将被禁用。"
-#: workspace.cpp:2507 workspace.cpp:2529 workspace.cpp:2567
+#: workspace.cpp:2900 workspace.cpp:2923 workspace.cpp:2962
msgid "Composite Manager Failure"
msgstr "复合管理器失败"
-#: workspace.cpp:2546
+#: workspace.cpp:2941
+#, fuzzy
msgid ""
-"<qt><b>kompmgr failed to open the display</b>"
-"<br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"
+"<qt><b>The TDE composition manager failed to open the display</b>"
+"<br>There is probably an invalid display entry in your ~/.compton-tde.conf "
+"file.</qt>"
msgstr "<qt><b>kompmgr 打开显示失败</b><br>可能在您的 ~/.xcompmgrrc 中有无效的显示项。</qt>"
-#: workspace.cpp:2548
+#: workspace.cpp:2943
+#, fuzzy
msgid ""
-"<qt><b>kompmgr cannot find the Xrender extension</b>"
+"<qt><b>The TDE composition manager cannot find the Xrender extension</b>"
"<br>You are using either an outdated or a crippled version of XOrg."
"<br>Get XOrg &ge; 6.8 from www.freedesktop.org."
"<br></qt>"
@@ -607,7 +732,7 @@ msgstr ""
"<br>请从 www.freedesktop.org 获取 XOrg &ge; 6.8。"
"<br></qt>"
-#: workspace.cpp:2550
+#: workspace.cpp:2945
msgid ""
"<qt><b>Composite extension not found</b>"
"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work."
@@ -623,20 +748,21 @@ msgstr ""
"<br>Option \"Composite\" \"Enable\""
"<br>EndSection</i></qt>"
-#: workspace.cpp:2555
+#: workspace.cpp:2950
msgid ""
"<qt><b>Damage extension not found</b>"
"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
msgstr "<qt><b>损坏扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴影。</qt>"
-#: workspace.cpp:2557
+#: workspace.cpp:2952
msgid ""
"<qt><b>XFixes extension not found</b>"
"<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
msgstr "<qt><b>XFixes 扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴影。</qt>"
#: killer/killer.cpp:50
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
msgstr "KWin 助手工具"
#: killer/killer.cpp:67
@@ -661,55 +787,55 @@ msgstr "中止"
msgid "Keep Running"
msgstr "保持运行"
-#: lib/kcommondecoration.cpp:265
+#: lib/kcommondecoration.cpp:270
msgid ""
"_: %1 is the name of window decoration style\n"
"<center><b>%1 preview</b></center>"
msgstr "<center><b>%1 预览</b></center>"
-#: lib/kcommondecoration.cpp:329
+#: lib/kcommondecoration.cpp:351
msgid "Menu"
msgstr "菜单"
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:529
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:554
msgid "Not on all desktops"
msgstr "不在全部桌面"
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:530
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:555
msgid "On all desktops"
msgstr "全部桌面"
-#: lib/kcommondecoration.cpp:364
+#: lib/kcommondecoration.cpp:389
msgid "Minimize"
msgstr "最小化"
-#: lib/kcommondecoration.cpp:376 lib/kcommondecoration.cpp:516
+#: lib/kcommondecoration.cpp:401 lib/kcommondecoration.cpp:541
msgid "Maximize"
msgstr "最大化"
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
msgid "Do not keep above others"
msgstr "不常居顶端"
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
-#: lib/kcommondecoration.cpp:596
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
+#: lib/kcommondecoration.cpp:621
msgid "Keep above others"
msgstr "常居顶端"
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:614
msgid "Do not keep below others"
msgstr "不常居底端"
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:579
-#: lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:604
+#: lib/kcommondecoration.cpp:614
msgid "Keep below others"
msgstr "常居底端"
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:541
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:566
msgid "Unshade"
msgstr "展开"
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:542
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:567
msgid "Shade"
msgstr "卷起"
@@ -722,5 +848,12 @@ msgid "The default decoration plugin is corrupt and could not be loaded."
msgstr "默认的装饰插件损坏,无法被载入。"
#: lib/kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
msgstr "库 %1 不是 KWin 插件。"
+
+#~ msgid "KWin"
+#~ msgstr "KWin"
+
+#~ msgid "The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory."
+#~ msgstr "无法启动复合管理器。\\n请确定您在 $PATH 目录中存有“kompmgr”。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin_clients.po b/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
index 629205306c4..c04c5c8b756 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
@@ -1,111 +1,36 @@
msgid ""
msgstr ""
"Project-Id-Version: twin_clients\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-05-14 05:21+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: quartz/quartz.cpp:513
+msgid "Quartz"
+msgstr "Quartz"
+
#: b2/config/config.cpp:41 quartz/config/config.cpp:40
msgid "Draw window frames using &titlebar colors"
msgstr "使用标题栏颜色绘制窗口框架(&T)"
-#: b2/config/config.cpp:43
+#: quartz/config/config.cpp:42
msgid ""
-"When selected, the window borders are drawn using the titlebar colors; "
-"otherwise, they are drawn using normal border colors."
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors; otherwise, they are drawn using normal border colors instead."
msgstr "选中时,窗口边框会使用标题栏颜色绘制;否则,将使用普通边框颜色绘制。"
-#: b2/config/config.cpp:49
-msgid "Draw &resize handle"
-msgstr "绘制缩放柄(&R)"
-
-#: b2/config/config.cpp:51
-msgid ""
-"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
-"corner of the windows; otherwise, no grab handle is drawn."
-msgstr "选中时,装饰会在窗口的右下角绘制“缩放柄”;否则不显示该缩放柄。"
-
-#: b2/config/config.cpp:56
-msgid "Actions Settings"
-msgstr "动作设置"
-
-#: b2/config/config.cpp:58
-msgid "Double click on menu button:"
-msgstr "双击菜单按钮:"
-
-#: b2/config/config.cpp:60
-msgid "Do Nothing"
-msgstr "无"
-
-#: b2/config/config.cpp:61
-msgid "Minimize Window"
-msgstr "最小化窗口"
-
-#: b2/config/config.cpp:62
-msgid "Shade Window"
-msgstr "卷起窗口"
-
-#: b2/config/config.cpp:63
-msgid "Close Window"
-msgstr "关闭窗口"
-
-#: b2/config/config.cpp:66
-msgid ""
-"An action can be associated to a double click of the menu button. Leave it to "
-"none if in doubt."
-msgstr "双击菜单按钮可关联到一个操作。如果您保持怀疑的话,请设置为空。"
-
-#: b2/b2client.cpp:346 keramik/keramik.cpp:1036
-#: kwmtheme/kwmthemeclient.cpp:292
-msgid "Menu"
-msgstr "菜单"
-
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "Not on all desktops"
-msgstr "不在全部桌面上"
-
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "On all desktops"
-msgstr "在全部桌面上"
-
-#: b2/b2client.cpp:349 keramik/keramik.cpp:1066
-#: kwmtheme/kwmthemeclient.cpp:312
-msgid "Minimize"
-msgstr "最小化"
-
-#: b2/b2client.cpp:349 b2/b2client.cpp:826 keramik/keramik.cpp:1075
-#: keramik/keramik.cpp:1419 kwmtheme/kwmthemeclient.cpp:320
-#: kwmtheme/kwmthemeclient.cpp:775
-msgid "Maximize"
-msgstr "最大化"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Unshade"
-msgstr "展开"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Shade"
-msgstr "卷起"
-
-#: b2/b2client.cpp:352
-msgid "Resize"
-msgstr "大小"
-
-#: b2/b2client.cpp:390
-msgid "<b><center>B II preview</center></b>"
-msgstr "<b><center>B II 预览</center></b>"
+#: quartz/config/config.cpp:45
+msgid "Quartz &extra slim"
+msgstr "石英超细(&E)"
-#: web/Web.cpp:53
-msgid "Web"
-msgstr "Web"
+#: quartz/config/config.cpp:47
+msgid "Quartz window decorations with extra-small title bar."
+msgstr "超小标题栏的石英窗口装饰。"
#: default/config/config.cpp:40
msgid "Draw titlebar &stipple effect"
@@ -138,148 +63,210 @@ msgid ""
msgstr "选中时,装饰将会以高色彩显示渐变;否则没有渐变效果。"
#: default/kdedefault.cpp:746
-msgid "TDE2"
-msgstr "TDE2"
+msgid "KDE2"
+msgstr ""
-#: keramik/keramik.cpp:964
-msgid "<center><b>Keramik preview</b></center>"
-msgstr "<center><b>Keramik 预览</b></center>"
+#: modernsystem/modernsys.cpp:383
+msgid "Modern System"
+msgstr "现代系统"
-#: keramik/keramik.cpp:1093
-msgid "Keep Above Others"
-msgstr "常居顶端"
+#: modernsystem/config/config.cpp:40
+msgid "&Show window resize handle"
+msgstr "显示窗口缩放柄(&S)"
-#: keramik/keramik.cpp:1102
-msgid "Keep Below Others"
-msgstr "常居底端"
+#: modernsystem/config/config.cpp:42
+msgid ""
+"When selected, all windows are drawn with a resize handle at the lower right "
+"corner. This makes window resizing easier, especially for trackballs and other "
+"mouse replacements on laptops."
+msgstr "选中时,所有窗口都会在右下角绘制一个缩放柄。这将使得窗口缩放更加容易,特别是对那些轨迹球和笔记本电脑上的其它替代设备。"
-#: redmond/redmond.cpp:353
-msgid "Redmond"
-msgstr "Redmond"
+#: modernsystem/config/config.cpp:52
+msgid "Here you can change the size of the resize handle."
+msgstr "您可在此更改缩放柄的大小。"
+
+#: modernsystem/config/config.cpp:61
+msgid "Small"
+msgstr "小"
+
+#: modernsystem/config/config.cpp:63
+msgid "Medium"
+msgstr "中"
+
+#: modernsystem/config/config.cpp:65
+msgid "Large"
+msgstr "大"
+
+#: kwmtheme/cli_installer/main.cpp:12
+msgid "Installs a KWM theme"
+msgstr "安装 KWM 主题"
+
+#: kwmtheme/cli_installer/main.cpp:16
+msgid "Path to a theme config file"
+msgstr "主题配置文件"
#: kwmtheme/kwmthemeclient.cpp:260
msgid "<center><b>KWMTheme</b></center>"
msgstr "<center><b>KWMTheme</b></center>"
+#: b2/b2client.cpp:347 keramik/keramik.cpp:1053
+#: kwmtheme/kwmthemeclient.cpp:292
+msgid "Menu"
+msgstr "菜单"
+
#: kwmtheme/kwmthemeclient.cpp:301 kwmtheme/kwmthemeclient.cpp:765
msgid "Sticky"
msgstr "吸附"
+#: b2/b2client.cpp:350 keramik/keramik.cpp:1086
+#: kwmtheme/kwmthemeclient.cpp:312
+msgid "Minimize"
+msgstr "最小化"
+
+#: b2/b2client.cpp:350 b2/b2client.cpp:847 keramik/keramik.cpp:1095
+#: keramik/keramik.cpp:1439 kwmtheme/kwmthemeclient.cpp:320
+#: kwmtheme/kwmthemeclient.cpp:775
+msgid "Maximize"
+msgstr "最大化"
+
#: kwmtheme/kwmthemeclient.cpp:765
msgid "Unsticky"
msgstr "取消吸附"
-#: kwmtheme/cli_installer/main.cpp:12
-msgid "Installs a KWM theme"
-msgstr "安装 KWM 主题"
+#: redmond/redmond.cpp:353
+msgid "Redmond"
+msgstr "Redmond"
-#: kwmtheme/cli_installer/main.cpp:16
-msgid "Path to a theme config file"
-msgstr "主题配置文件"
+#: plastik/plastikclient.cpp:56
+msgid "Plastik"
+msgstr "塑料"
-#: laptop/laptopclient.cpp:353
-msgid "Laptop"
-msgstr "便携"
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "Not on all desktops"
+msgstr "不在全部桌面上"
-#. i18n: file ./keramik/config/keramikconfig.ui line 16
-#: rc.cpp:3
-#, no-c-format
-msgid "Keramik"
-msgstr "Keramik"
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "On all desktops"
+msgstr "在全部桌面上"
-#. i18n: file ./keramik/config/keramikconfig.ui line 30
-#: rc.cpp:6
-#, no-c-format
-msgid "Display the window &icon in the caption bubble"
-msgstr "在标题气泡中显示窗口图标(&I)"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Unshade"
+msgstr "展开"
-#. i18n: file ./keramik/config/keramikconfig.ui line 33
-#: rc.cpp:9
-#, no-c-format
-msgid ""
-"Check this option if you want the window icon to be displayed in the caption "
-"bubble next to the titlebar text."
-msgstr "如果您想要在标题栏文本旁边的标题气泡中显示窗口图标,请选中此选项。"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Shade"
+msgstr "卷起"
-#. i18n: file ./keramik/config/keramikconfig.ui line 41
-#: rc.cpp:12
-#, no-c-format
-msgid "Draw &small caption bubbles on active windows"
-msgstr "在激活窗口中绘制小的标题气泡(&S)"
+#: b2/b2client.cpp:353
+msgid "Resize"
+msgstr "大小"
-#. i18n: file ./keramik/config/keramikconfig.ui line 44
-#: rc.cpp:15
-#, no-c-format
+#: b2/b2client.cpp:391
+msgid "<b><center>B II preview</center></b>"
+msgstr "<b><center>B II 预览</center></b>"
+
+#: b2/config/config.cpp:43
msgid ""
-"Check this option if you want the caption bubble to have the same size on "
-"active windows that it has on inactive ones. This option is useful for laptops "
-"or low resolution displays where you want maximize the amount of space "
-"available to the window contents."
-msgstr ""
-"如果您想要在激活窗口中显示与非激活窗口中同样的标题气泡,请选中此选项。此选项特别用于笔记本电脑或分辨率较低的显示器,因为您可以将更多的空间留给窗口的实际内容。"
+"When selected, the window borders are drawn using the titlebar colors; "
+"otherwise, they are drawn using normal border colors."
+msgstr "选中时,窗口边框会使用标题栏颜色绘制;否则,将使用普通边框颜色绘制。"
-#. i18n: file ./keramik/config/keramikconfig.ui line 52
-#: rc.cpp:18
-#, no-c-format
-msgid "Draw g&rab bars below windows"
-msgstr "在窗口下绘制拖曳栏(&R)"
+#: b2/config/config.cpp:49
+msgid "Draw &resize handle"
+msgstr "绘制缩放柄(&R)"
-#. i18n: file ./keramik/config/keramikconfig.ui line 55
-#: rc.cpp:21
-#, no-c-format
+#: b2/config/config.cpp:51
msgid ""
-"Check this option if you want a grab bar to be drawn below windows. When this "
-"option is not selected only a thin border will be drawn in its place."
-msgstr "选中时,装饰将会在窗口下绘制“拖曳栏”;否则将仅会在其位置处绘制细边框。"
+"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
+"corner of the windows; otherwise, no grab handle is drawn."
+msgstr "选中时,装饰会在窗口的右下角绘制“缩放柄”;否则不显示该缩放柄。"
-#. i18n: file ./keramik/config/keramikconfig.ui line 63
-#: rc.cpp:24 rc.cpp:51
-#, no-c-format
-msgid "Use shadowed &text"
-msgstr "使用带阴影的文字(&T)"
+#: b2/config/config.cpp:56
+msgid "Actions Settings"
+msgstr "动作设置"
-#. i18n: file ./keramik/config/keramikconfig.ui line 66
-#: rc.cpp:27 rc.cpp:54
-#, no-c-format
+#: b2/config/config.cpp:58
+msgid "Double click on menu button:"
+msgstr "双击菜单按钮:"
+
+#: b2/config/config.cpp:60
+msgid "Do Nothing"
+msgstr "无"
+
+#: b2/config/config.cpp:61
+msgid "Minimize Window"
+msgstr "最小化窗口"
+
+#: b2/config/config.cpp:62
+msgid "Shade Window"
+msgstr "卷起窗口"
+
+#: b2/config/config.cpp:63
+msgid "Close Window"
+msgstr "关闭窗口"
+
+#: b2/config/config.cpp:66
msgid ""
-"Check this option if you want the titlebar text to have a 3D look with a shadow "
-"behind it."
-msgstr "如果您想要让标题栏文字的后面有立体效果的阴影,请选中此选项。"
+"An action can be associated to a double click of the menu button. Leave it to "
+"none if in doubt."
+msgstr "双击菜单按钮可关联到一个操作。如果您保持怀疑的话,请设置为空。"
+
+#: web/Web.cpp:53
+msgid "Web"
+msgstr "Web"
#. i18n: file ./plastik/config/configdialog.ui line 16
-#: rc.cpp:30
+#: rc.cpp:3
#, no-c-format
msgid "Config Dialog"
msgstr "配置对话框"
#. i18n: file ./plastik/config/configdialog.ui line 30
-#: rc.cpp:33
+#: rc.cpp:6
#, no-c-format
msgid "Title &Alignment"
msgstr "标题排列(&A)"
#. i18n: file ./plastik/config/configdialog.ui line 67
-#: rc.cpp:45
+#: rc.cpp:18
#, no-c-format
msgid "Colored window border"
msgstr "对窗口边框着色"
#. i18n: file ./plastik/config/configdialog.ui line 73
-#: rc.cpp:48
+#: rc.cpp:21
#, no-c-format
msgid ""
"Check this option if the window border should be painted in the titlebar color. "
"Otherwise it will be painted in the background color."
msgstr "选中时,窗口边框会使用标题栏颜色绘制。否则,将使用背景颜色绘制。"
+#. i18n: file ./plastik/config/configdialog.ui line 81
+#: rc.cpp:24 rc.cpp:63
+#, no-c-format
+msgid "Use shadowed &text"
+msgstr "使用带阴影的文字(&T)"
+
+#. i18n: file ./plastik/config/configdialog.ui line 84
+#: rc.cpp:27 rc.cpp:66
+#, no-c-format
+msgid ""
+"Check this option if you want the titlebar text to have a 3D look with a shadow "
+"behind it."
+msgstr "如果您想要让标题栏文字的后面有立体效果的阴影,请选中此选项。"
+
#. i18n: file ./plastik/config/configdialog.ui line 92
-#: rc.cpp:57
+#: rc.cpp:30
#, no-c-format
msgid "Animate buttons"
msgstr "动画按钮"
#. i18n: file ./plastik/config/configdialog.ui line 95
-#: rc.cpp:60
+#: rc.cpp:33
#, no-c-format
msgid ""
"Check this option if you want the buttons to fade in when the mouse pointer "
@@ -287,71 +274,88 @@ msgid ""
msgstr "如果您想要当鼠标指针移入或移出按钮的时候显示淡入淡出的效果,请选中此选项。"
#. i18n: file ./plastik/config/configdialog.ui line 103
-#: rc.cpp:63
+#: rc.cpp:36
#, no-c-format
msgid "Close windows by double clicking the menu button"
msgstr "双击菜单按钮可关闭窗口"
#. i18n: file ./plastik/config/configdialog.ui line 106
-#: rc.cpp:66
+#: rc.cpp:39
#, no-c-format
msgid ""
"Check this option if you want windows to be closed when you double click the "
"menu button, similar to Microsoft Windows."
msgstr "如果您想要在双击菜单按钮的时候关闭窗口,也就是和 Microsoft Windows 一样,请选中此选项。"
-#: quartz/config/config.cpp:42
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors; otherwise, they are drawn using normal border colors instead."
-msgstr "选中时,窗口边框会使用标题栏颜色绘制;否则,将使用普通边框颜色绘制。"
-
-#: quartz/config/config.cpp:45
-msgid "Quartz &extra slim"
-msgstr "石英超细(&E)"
+#. i18n: file ./keramik/config/keramikconfig.ui line 16
+#: rc.cpp:42
+#, no-c-format
+msgid "Keramik"
+msgstr "Keramik"
-#: quartz/config/config.cpp:47
-msgid "Quartz window decorations with extra-small title bar."
-msgstr "超小标题栏的石英窗口装饰。"
+#. i18n: file ./keramik/config/keramikconfig.ui line 30
+#: rc.cpp:45
+#, no-c-format
+msgid "Display the window &icon in the caption bubble"
+msgstr "在标题气泡中显示窗口图标(&I)"
-#: quartz/quartz.cpp:513
-msgid "Quartz"
-msgstr "Quartz"
+#. i18n: file ./keramik/config/keramikconfig.ui line 33
+#: rc.cpp:48
+#, no-c-format
+msgid ""
+"Check this option if you want the window icon to be displayed in the caption "
+"bubble next to the titlebar text."
+msgstr "如果您想要在标题栏文本旁边的标题气泡中显示窗口图标,请选中此选项。"
-#: modernsystem/config/config.cpp:40
-msgid "&Show window resize handle"
-msgstr "显示窗口缩放柄(&S)"
+#. i18n: file ./keramik/config/keramikconfig.ui line 41
+#: rc.cpp:51
+#, no-c-format
+msgid "Draw &small caption bubbles on active windows"
+msgstr "在激活窗口中绘制小的标题气泡(&S)"
-#: modernsystem/config/config.cpp:42
+#. i18n: file ./keramik/config/keramikconfig.ui line 44
+#: rc.cpp:54
+#, no-c-format
msgid ""
-"When selected, all windows are drawn with a resize handle at the lower right "
-"corner. This makes window resizing easier, especially for trackballs and other "
-"mouse replacements on laptops."
-msgstr "选中时,所有窗口都会在右下角绘制一个缩放柄。这将使得窗口缩放更加容易,特别是对那些轨迹球和笔记本电脑上的其它替代设备。"
+"Check this option if you want the caption bubble to have the same size on "
+"active windows that it has on inactive ones. This option is useful for laptops "
+"or low resolution displays where you want maximize the amount of space "
+"available to the window contents."
+msgstr ""
+"如果您想要在激活窗口中显示与非激活窗口中同样的标题气泡,请选中此选项。此选项特别用于笔记本电脑或分辨率较低的显示器,因为您可以将更多的空间留给窗口的实际内容。"
-#: modernsystem/config/config.cpp:52
-msgid "Here you can change the size of the resize handle."
-msgstr "您可在此更改缩放柄的大小。"
+#. i18n: file ./keramik/config/keramikconfig.ui line 52
+#: rc.cpp:57
+#, no-c-format
+msgid "Draw g&rab bars below windows"
+msgstr "在窗口下绘制拖曳栏(&R)"
-#: modernsystem/config/config.cpp:61
-msgid "Small"
-msgstr "小"
+#. i18n: file ./keramik/config/keramikconfig.ui line 55
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Check this option if you want a grab bar to be drawn below windows. When this "
+"option is not selected only a thin border will be drawn in its place."
+msgstr "选中时,装饰将会在窗口下绘制“拖曳栏”;否则将仅会在其位置处绘制细边框。"
-#: modernsystem/config/config.cpp:63
-msgid "Medium"
-msgstr "中"
+#: keramik/keramik.cpp:965
+msgid "<center><b>Keramik preview</b></center>"
+msgstr "<center><b>Keramik 预览</b></center>"
-#: modernsystem/config/config.cpp:65
-msgid "Large"
-msgstr "大"
+#: keramik/keramik.cpp:1113
+msgid "Keep Above Others"
+msgstr "常居顶端"
-#: modernsystem/modernsys.cpp:383
-msgid "Modern System"
-msgstr "现代系统"
+#: keramik/keramik.cpp:1122
+msgid "Keep Below Others"
+msgstr "常居底端"
-#: plastik/plastikclient.cpp:56
-msgid "Plastik"
-msgstr "塑料"
+#: laptop/laptopclient.cpp:353
+msgid "Laptop"
+msgstr "便携"
+
+#~ msgid "TDE2"
+#~ msgstr "TDE2"
#~ msgid "<center><b>Web preview</b></center>"
#~ msgstr "<center><b>Web 预览</b></center>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin_lib.po b/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
index e3460821db9..951c7cf5039 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
@@ -4,74 +4,76 @@
msgid ""
msgstr ""
"Project-Id-Version: twin_lib\n"
-"POT-Creation-Date: 2005-10-08 02:42+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-08-01 07:07+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kcommondecoration.cpp:265
+#: kdecoration_plugins_p.cpp:120
+msgid "No window decoration plugin library was found."
+msgstr "未找到窗口装饰插件库。"
+
+#: kdecoration_plugins_p.cpp:145
+msgid "The default decoration plugin is corrupt and could not be loaded."
+msgstr "默认的装饰插件已经损坏,无法装入。"
+
+#: kdecoration_plugins_p.cpp:159
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
+msgstr "库 %1 不是 KWin 插件。"
+
+#: kcommondecoration.cpp:270
msgid ""
"_: %1 is the name of window decoration style\n"
"<center><b>%1 preview</b></center>"
msgstr "<center><b>%1 预览</b></center>"
-#: kcommondecoration.cpp:329
+#: kcommondecoration.cpp:351
msgid "Menu"
msgstr "菜单"
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:529
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:554
msgid "Not on all desktops"
msgstr "不在全部桌面上"
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:530
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:555
msgid "On all desktops"
msgstr "在全部桌面上"
-#: kcommondecoration.cpp:364
+#: kcommondecoration.cpp:389
msgid "Minimize"
msgstr "最小化"
-#: kcommondecoration.cpp:376 kcommondecoration.cpp:516
+#: kcommondecoration.cpp:401 kcommondecoration.cpp:541
msgid "Maximize"
msgstr "最大化"
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
msgid "Do not keep above others"
msgstr "不常居顶端"
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
-#: kcommondecoration.cpp:596
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
+#: kcommondecoration.cpp:621
msgid "Keep above others"
msgstr "常居顶端"
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:614
msgid "Do not keep below others"
msgstr "不常居底端"
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:579
-#: kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:604
+#: kcommondecoration.cpp:614
msgid "Keep below others"
msgstr "常居底端"
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:541
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:566
msgid "Unshade"
msgstr "展开"
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:542
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:567
msgid "Shade"
msgstr "卷起"
-
-#: kdecoration_plugins_p.cpp:120
-msgid "No window decoration plugin library was found."
-msgstr "未找到窗口装饰插件库。"
-
-#: kdecoration_plugins_p.cpp:145
-msgid "The default decoration plugin is corrupt and could not be loaded."
-msgstr "默认的装饰插件已经损坏,无法装入。"
-
-#: kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
-msgstr "库 %1 不是 KWin 插件。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/useraccount.po b/tde-i18n-zh_CN/messages/tdebase/useraccount.po
index f4e61f9368e..90cf5838a08 100644
--- a/tde-i18n-zh_CN/messages/tdebase/useraccount.po
+++ b/tde-i18n-zh_CN/messages/tdebase/useraccount.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: useraccount\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
"PO-Revision-Date: 2005-01-01 17:03+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -143,7 +144,7 @@ msgstr "保存图像时出错:%1"
msgid "Your administrator has disallowed changing your image."
msgstr "您的管理员禁止您更改图像。"
-#: main.cpp:334
+#: main.cpp:333
msgid ""
"%1 does not appear to be an image file.\n"
"Please use files with these extensions:\n"